Mercurial > hg > release > icedtea-web-1.0
changeset 46:e1400d406d85
2010-11-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am (LAUNCHER_LINK): Don't explicitely link with -lc,
link with -pthread instead of -lpthread.
(LAUNCHER_FLAGS): Add -pthread.
2010-11-24 Chris Coulson <chris.coulson@canonical.com>
* Makefile.am (pluginappletviewer, javaws):
Fix linking with --as-needed.
author | doko@ubuntu.com |
---|---|
date | Wed, 24 Nov 2010 13:41:57 +0100 |
parents | dd77da50a226 |
children | 5782c25b26dc |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 23 10:05:06 2010 -0500 +++ b/ChangeLog Wed Nov 24 13:41:57 2010 +0100 @@ -1,3 +1,14 @@ +2010-11-24 Matthias Klose <doko@ubuntu.com> + + * Makefile.am (LAUNCHER_LINK): Don't explicitely link with -lc, + link with -pthread instead of -lpthread. + (LAUNCHER_FLAGS): Add -pthread. + +2010-11-24 Chris Coulson <chris.coulson@canonical.com> + + * Makefile.am (pluginappletviewer, javaws): + Fix linking with --as-needed. + 2010-11-23 Omair Majid <omajid@redhat.com> * netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java:
--- a/Makefile.am Tue Nov 23 10:05:06 2010 -0500 +++ b/Makefile.am Wed Nov 24 13:41:57 2010 +0100 @@ -57,13 +57,13 @@ LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS)) NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS)) -LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \ +LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -pthread -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \ -g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \ -DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"' -LAUNCHER_LINK = -o $@ -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \ +LAUNCHER_LINK = -o $@ -pthread -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \ -Wl,-soname=lib.so -L $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli -Wl,-z -Wl,origin \ -Wl,--allow-shlib-undefined -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \ - -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lc -lz + -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lz PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG) EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher @@ -149,7 +149,7 @@ $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "sun.applet.PluginMain" }' -DPROGNAME='"pluginappletviewer"' -c -o $@ $< $(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS) - $(CC) $(LAUNCHER_LINK) $(PLUGIN_LAUNCHER_OBJECTS) + $(CC) $(PLUGIN_LAUNCHER_OBJECTS) $(LAUNCHER_LINK) clean-IcedTeaPlugin: rm -f $(PLUGIN_DIR)/launcher/*.o @@ -279,7 +279,7 @@ $(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS) mkdir -p launcher - $(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS) + $(CC) $(NETX_LAUNCHER_OBJECTS) $(LAUNCHER_LINK) javaws.desktop: javaws.desktop.in sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < javaws.desktop.in > javaws.desktop