Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
service-wrapper-java
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Java Maintainers
service-wrapper-java
Commits
65259fc6
Commit
65259fc6
authored
4 years ago
by
Markus Koschany
Browse files
Options
Downloads
Patches
Plain Diff
Fix FTBFS on ppc64el and s390x.
Thanks: Logan Rosen and Dimitri John Ledkov for the patch. Closes: #976915
parent
5e2ed8e4
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
debian/patches/fix-as-needed-ppc.patch
+28
-8
28 additions, 8 deletions
debian/patches/fix-as-needed-ppc.patch
with
28 additions
and
8 deletions
debian/patches/fix-as-needed-ppc.patch
+
28
−
8
View file @
65259fc6
...
...
@@ -3,10 +3,9 @@ Description: Fix FTBFS on ppc:
Author: Andreas Moog <amoog@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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment