commit: e96d1fa00824d8511dfe892693e43ca52f9931dc
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 10:09:25 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 10:09:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96d1fa0
dev-java/icedtea-web: Oops, forgot that ldflags patch was for 1.7
Package-Manager: portage-2.2.27
.../files/icedtea-web-1.6-respect-ldflags.patch | 29 ++++++++--------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
index 551bb9c..1d03b7c 100644
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
@@ -1,27 +1,18 @@
--- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100
-+++ Makefile.am.orig 2016-01-27 22:20:28.288032089 +0000
-@@ -362,7 +362,7 @@
-
- $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix
$(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
++++ Makefile.am 2015-12-18 21:37:43.328862431 +0000
+@@ -344,7 +344,7 @@
+ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
+ mkdir -p $(PLUGIN_DIR) && \
cd $(PLUGIN_DIR) && \
- $(CXX) $(CXXFLAGS) \
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \
- $(PLUGIN_OBJECTS) \
- $(GLIB_LIBS) \
- $(MOZILLA_LIBS) \
-@@ -419,7 +419,7 @@
-
- $(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB)
stamps/cpp-unit-tests-compile.stamp
- cd $(CPP_UNITTEST_DIR) && \
-- $(CXX) $(CXXFLAGS) \
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \
- $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \
- $(CPP_UNITTEST_DIR)/*.o \
- -lrt \
-@@ -1252,7 +1252,7 @@
+ $(DEFS) $(VERSION_DEFS) \
+ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
+ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
+@@ -362,7 +362,7 @@
- $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix
$(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
- cd $(COVERABLE_PLUGIN_DIR) && \
+ $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix
$(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+ cd $(PLUGIN_DIR) && \
- $(CXX) $(CXXFLAGS) \
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \
$(PLUGIN_OBJECTS) \
