| 1 |
commit: e96d1fa00824d8511dfe892693e43ca52f9931dc |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 18 10:09:25 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 18 10:09:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96d1fa0 |
| 7 |
|
| 8 |
dev-java/icedtea-web: Oops, forgot that ldflags patch was for 1.7 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
.../files/icedtea-web-1.6-respect-ldflags.patch | 29 ++++++++-------------- |
| 13 |
1 file changed, 10 insertions(+), 19 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index 551bb9c..1d03b7c 100644 |
| 17 |
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch |
| 18 |
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch |
| 19 |
@@ -1,27 +1,18 @@ |
| 20 |
--- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100 |
| 21 |
-+++ Makefile.am.orig 2016-01-27 22:20:28.288032089 +0000 |
| 22 |
-@@ -362,7 +362,7 @@ |
| 23 |
- |
| 24 |
- $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
| 25 |
++++ Makefile.am 2015-12-18 21:37:43.328862431 +0000 |
| 26 |
+@@ -344,7 +344,7 @@ |
| 27 |
+ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc |
| 28 |
+ mkdir -p $(PLUGIN_DIR) && \ |
| 29 |
cd $(PLUGIN_DIR) && \ |
| 30 |
- $(CXX) $(CXXFLAGS) \ |
| 31 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
| 32 |
- $(PLUGIN_OBJECTS) \ |
| 33 |
- $(GLIB_LIBS) \ |
| 34 |
- $(MOZILLA_LIBS) \ |
| 35 |
-@@ -419,7 +419,7 @@ |
| 36 |
- |
| 37 |
- $(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp |
| 38 |
- cd $(CPP_UNITTEST_DIR) && \ |
| 39 |
-- $(CXX) $(CXXFLAGS) \ |
| 40 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
| 41 |
- $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \ |
| 42 |
- $(CPP_UNITTEST_DIR)/*.o \ |
| 43 |
- -lrt \ |
| 44 |
-@@ -1252,7 +1252,7 @@ |
| 45 |
+ $(DEFS) $(VERSION_DEFS) \ |
| 46 |
+ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ |
| 47 |
+ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ |
| 48 |
+@@ -362,7 +362,7 @@ |
| 49 |
|
| 50 |
- $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
| 51 |
- cd $(COVERABLE_PLUGIN_DIR) && \ |
| 52 |
+ $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
| 53 |
+ cd $(PLUGIN_DIR) && \ |
| 54 |
- $(CXX) $(CXXFLAGS) \ |
| 55 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
| 56 |
$(PLUGIN_OBJECTS) \ |
Archives