user debian-rele...@lists.debian.org usertag 920000 + bsp-2019-02-de-bonn tag 920000 pending thank you
Greetings from the BSP taking place at Teckids e.V./tarent solutions GmbH in Bonn this weekend. I have applied Laurent's patch and uploaded nacl/20110221-6.1 to DELAYED/2. Feel free to reschedule my upload as you see fit. The debiff is attached to this mail. On another note, the master branch at https://salsa.debian.org/debian/nacl.git does not reflect the state of the source package -- it contains extra files. You may want to fix that. Cheers, -Hilko
diff -Nru nacl-20110221/debian/changelog nacl-20110221/debian/changelog --- nacl-20110221/debian/changelog 2018-10-23 15:04:30.000000000 +0200 +++ nacl-20110221/debian/changelog 2019-02-24 10:54:10.000000000 +0100 @@ -1,3 +1,11 @@ +nacl (20110221-6.1) unstable; urgency=medium + + * Non-maintainer upload + * Update patch to remove superfluous build flags, thanks to Laurent Bigonville + (Closes: #920000) + + -- Hilko Bengen <ben...@debian.org> Sun, 24 Feb 2019 10:54:10 +0100 + nacl (20110221-6) unstable; urgency=medium [ Ondřej Nový ] diff -Nru nacl-20110221/debian/patches/0002-remove-superfluous-compiler-flags.patch nacl-20110221/debian/patches/0002-remove-superfluous-compiler-flags.patch --- nacl-20110221/debian/patches/0002-remove-superfluous-compiler-flags.patch 2018-10-22 08:10:48.000000000 +0200 +++ nacl-20110221/debian/patches/0002-remove-superfluous-compiler-flags.patch 2019-02-24 10:54:10.000000000 +0100 @@ -11,35 +11,32 @@ okcompilers/cpp | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) -diff --git a/okcompilers/c b/okcompilers/c -index 7218da3..2667f82 100644 --- a/okcompilers/c +++ b/okcompilers/c -@@ -1,8 +1,5 @@ +@@ -1,8 +1 @@ -gcc -m64 -O3 -fomit-frame-pointer -funroll-loops -gcc -m64 -O -fomit-frame-pointer -gcc -m64 -fomit-frame-pointer -gcc -m32 -O3 -fomit-frame-pointer -funroll-loops -gcc -m32 -O -fomit-frame-pointer -gcc -m32 -fomit-frame-pointer -+gcc -O3 -fomit-frame-pointer -funroll-loops -+gcc -O -fomit-frame-pointer -+gcc -fomit-frame-pointer - spu-gcc -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand - spu-gcc -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand -diff --git a/okcompilers/cpp b/okcompilers/cpp -index d1b9ae6..35304e4 100644 +-spu-gcc -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand +-spu-gcc -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand ++gcc ${CFLAGS} --- a/okcompilers/cpp +++ b/okcompilers/cpp -@@ -1,8 +1,5 @@ +@@ -1,8 +1 @@ -g++ -m64 -O3 -fomit-frame-pointer -funroll-loops -g++ -m64 -O -fomit-frame-pointer -g++ -m64 -fomit-frame-pointer -g++ -m32 -O3 -fomit-frame-pointer -funroll-loops -g++ -m32 -O -fomit-frame-pointer -g++ -m32 -fomit-frame-pointer -+g++ -O3 -fomit-frame-pointer -funroll-loops -+g++ -O -fomit-frame-pointer -+g++ -fomit-frame-pointer - spu-g++ -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand - spu-g++ -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand +-spu-g++ -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand +-spu-g++ -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand ++g++ ${CFLAGS} +--- a/okcompilers/archivers ++++ b/okcompilers/archivers +@@ -1,2 +1 @@ + ar +-ar -X64 diff -Nru nacl-20110221/debian/rules nacl-20110221/debian/rules --- nacl-20110221/debian/rules 2018-10-22 08:11:09.000000000 +0200 +++ nacl-20110221/debian/rules 2019-02-24 10:54:10.000000000 +0100 @@ -2,6 +2,8 @@ #export DH_VERBOSE=1 +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) + override_dh_auto_build: # some quick tests for the status of /sys to help debug failures -ls /sys @@ -13,5 +15,15 @@ # DJB "makefile"-ish ./do +override_dh_auto_configure: + [ -f okcompilers/c.orig ] || cp okcompilers/c okcompilers/c.orig + [ -f okcompilers/cpp.orig ] || cp okcompilers/cpp okcompilers/cpp.orig + sed -i 's|$${CFLAGS}|$(CFLAGS) -fPIC|g' okcompilers/c okcompilers/cpp + %: dh $@ + +override_dh_auto_clean: + mv -f okcompilers/c.orig okcompilers/c || true + mv -f okcompilers/cpp.orig okcompilers/cpp || true + dh_auto_clean