Bug#976915: (no subject)

[Logan Rosen]

Control: tags -1 patch

Subject: Re: service-wrapper-java: FTBFS on ppc64el:      [exec] wrapper.c:(.text+0x3598): undefined reference to `pow'
Followup-For: Bug #976915
Package: service-wrapper-java
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Version: 3.5.30-1

Dear Maintainer,

In Ubuntu, the attached patch (from Dimitri John Ledkov <xnox at ubuntu.com>) was applied to achieve the following:

  * Fix as-needed linking in ppc64el and s390x per-arch Makefiles too.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: bullseye/sid
  APT prefers groovy-updates
  APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500, 'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.128-microsoft-standard (SMP w/8 CPU threads)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
-------------- next part --------------
diff -Nru service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch
--- service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch	2016-12-19 07:17:55.000000000 -0500
+++ service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch	2017-06-20 06:22:53.000000000 -0400
@@ -3,10 +3,9 @@
 Author: Andreas Moog <amoog at 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 @@
  
  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 @@
  
  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