gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-29 10:18:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/icedtea-web: Oops, forgot that ldflags patch was for 1.7

Browse Source 
Package-Manager: portage-2.2.27
This commit is contained in:
James Le Cuirot
2016-02-18 10:09:25 +00:00
parent 57ebab71b3
commit e96d1fa008
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
View File

@@ -1,6 +1,15 @@
--- 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 @@
+++ 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) \
$(DEFS) $(VERSION_DEFS) \
-DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
-DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
@@ -362,7 +362,7 @@
$(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
cd $(PLUGIN_DIR) && \
@@ -9,21 +18,3 @@
$(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 @@
$(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
cd $(COVERABLE_PLUGIN_DIR) && \
- $(CXX) $(CXXFLAGS) \
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \
$(PLUGIN_OBJECTS) \
$(GLIB_LIBS) \
$(MOZILLA_LIBS) \