Markus Koschany pushed to branch master at Debian Java Maintainers / service-wrapper-java
Commits: 65259fc6 by Markus Koschany at 2020-12-15T01:18:20+01:00 Fix FTBFS on ppc64el and s390x. Thanks: Logan Rosen and Dimitri John Ledkov for the patch. Closes: #976915 - - - - - 257601e4 by Markus Koschany at 2020-12-15T01:19:35+01:00 Update changelog - - - - - 2 changed files: - debian/changelog - debian/patches/fix-as-needed-ppc.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +service-wrapper-java (3.5.30-3) unstable; urgency=medium + + * Team upload. + * Fix FTBFS on ppc64el and s390x. + Thanks to Logan Rosen and Dimitri John Ledkov for the patch. + (Closes: #976915) + + -- Markus Koschany <a...@debian.org> Tue, 15 Dec 2020 01:19:16 +0100 + service-wrapper-java (3.5.30-2) unstable; urgency=medium * Team upload. ===================================== debian/patches/fix-as-needed-ppc.patch ===================================== @@ -3,10 +3,9 @@ Description: Fix FTBFS on ppc: Author: Andreas Moog <am...@ubuntu.com> Bug: https://sourceforge.net/p/wrapper/bugs/285/ -diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make ---- wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make 2015-01-04 01:21:32.915068936 +0100 -+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make 2015-01-04 01:23:18.271591362 +0100 -@@ -33,7 +33,7 @@ init: +--- a/src/c/Makefile-linux-ppc-32.make ++++ b/src/c/Makefile-linux-ppc-32.make +@@ -33,7 +33,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) @@ -15,10 +14,9 @@ diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make wrap libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make ---- wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make 2015-01-04 01:21:32.915068936 +0100 -+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make 2015-01-04 01:23:02.287512123 +0100 -@@ -33,7 +33,7 @@ init: +--- a/src/c/Makefile-linux-ppc-64.make ++++ b/src/c/Makefile-linux-ppc-64.make +@@ -33,7 +33,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) @@ -27,3 +25,25 @@ diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make wrap libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so +--- a/src/c/Makefile-linux-ppcle-64.make ++++ b/src/c/Makefile-linux-ppcle-64.make +@@ -33,7 +33,7 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so +--- a/src/c/Makefile-linux-s390x-64.make ++++ b/src/c/Makefile-linux-s390x-64.make +@@ -34,7 +34,7 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper ++ $(COMPILE) -pthread $(wrapper_SOURCE) $(LDFLAGS) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so View it on GitLab: https://salsa.debian.org/java-team/service-wrapper-java/-/compare/5e2ed8e44f33a3e42a16b72428b1536e6f80a96f...257601e4e1ebcce2dedd04d46dc398a715d20dad -- View it on GitLab: https://salsa.debian.org/java-team/service-wrapper-java/-/compare/5e2ed8e44f33a3e42a16b72428b1536e6f80a96f...257601e4e1ebcce2dedd04d46dc398a715d20dad You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
