From 5b94c8b0b661526fa9bc235bbf8a6b2691e0d345 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 10 Oct 2021 13:49:33 +0200 Subject: udp2raw: ... --- overlays/udp2raw/package.nix | 2 +- overlays/udp2raw/udp2raw-makefile.patch | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/overlays/udp2raw/package.nix b/overlays/udp2raw/package.nix index ba9cdb20..a50d87d4 100644 --- a/overlays/udp2raw/package.nix +++ b/overlays/udp2raw/package.nix @@ -12,7 +12,7 @@ pkgsMusl.stdenv.mkDerivation rec { patches = [ ./udp2raw-makefile.patch ]; configurePhase = ""; buildPhase = '' - make amd64 + make amd64_hw_aes ''; installPhase = '' install -Dm755 udp2raw_amd64 $out/bin/udp2raw diff --git a/overlays/udp2raw/udp2raw-makefile.patch b/overlays/udp2raw/udp2raw-makefile.patch index 80b39c6b..512c6f8e 100644 --- a/overlays/udp2raw/udp2raw-makefile.patch +++ b/overlays/udp2raw/udp2raw-makefile.patch @@ -2,12 +2,11 @@ diff --git a/makefile b/makefile index e758e68..16a3b23 100755 --- a/makefile +++ b/makefile -@@ -53,7 +53,7 @@ mips24kc_le_asm_aes: git_version - #bcm2708: - # ${cc_bcm2708} -o ${NAME}_bcm2708 -I. ${SOURCES} ${FLAGS} -lrt -static -O3 +@@ -53,6 +53,6 @@ mips24kc_le_asm_aes: git_version amd64:git_version -- ${cc_local} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O3 -+ ${CXX} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O3 - - amd64_perf:git_version - ${cc_local} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g + ${cc_amd64} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O3 + amd64_hw_aes:git_version +- ${cc_amd64} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g ++ ${CXX} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g + x86:git_version + ${cc_x86} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb -- cgit v1.2.3