Fixing as-needed issues and respecting LDFLAGS wrt bug 321867. Committed with ssuominen blessing

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 275 insertions, 73 deletions

diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch
new file mode 100644
index 000000000000..5ea09e53d54a
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch
@@ -0,0 +1,275 @@
+Fixing as-needed issues and respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=321867
+
+--- configure
++++ configure
+@@ -465,7 +465,7 @@
+ # check for Glib 2.0 compile CFLAGS
+ if $pkgconfig --exists glib-2.0; then
+     GLIB_CFLAGS=`$pkgconfig --cflags glib-2.0`
+-    GLIB_LDFLAGS=`$pkgconfig --libs glib-2.0`
++    GLIB_LIBS=`$pkgconfig --libs glib-2.0`
+     GLIB_VERSION=`$pkgconfig --modversion glib-2.0`
+ else
+     echo "GLIB 2.0 environment not found"
+@@ -478,7 +478,7 @@
+     return 0;
+ }
+ EOF
+-if ! $cc $CFLAGS $GLIB_CFLAGS $GLIB_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
++if ! $cc $CFLAGS $LDFLAGS $GLIB_CFLAGS $TMPC -o $TMPE $GLIB_LIBS > /dev/null 2>&1; then
+     echo "GLIB 2.0 environment not usable"
+     rm -f $TMPC
+     exit 1
+@@ -489,7 +489,7 @@
+ if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then
+     if $pkgconfig --exists gtk+-2.0; then
+ 	GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0`
+-	GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0`
++	GTK_LIBS=`$pkgconfig --libs gtk+-2.0`
+ 	GTK_VERSION=`$pkgconfig --modversion gtk+-2.0`
+     else
+ 	echo "GTK+ 2.0 environment not found"
+@@ -502,7 +502,7 @@
+     return 0;
+ }
+ EOF
+-    if ! $cc $CFLAGS $GTK_CFLAGS $GTK_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
++    if ! $cc $CFLAGS $LDFLAGS $GTK_CFLAGS $TMPC -o $TMPE $GTK_LIBS > /dev/null 2>&1; then
+ 	echo "GTK+ 2.0 environment not usable"
+ 	rm -f $TMPC
+ 	exit 1
+@@ -514,12 +514,12 @@
+ if test "$build_player" = "yes"; then
+     if $pkgconfig --exists libcurl; then
+ 	CURL_CFLAGS=`$pkgconfig --cflags libcurl`
+-	CURL_LDFLAGS=`$pkgconfig --libs libcurl`
++	CURL_LIBS=`$pkgconfig --libs libcurl`
+     else
+ 	curlconfig=`which curl-config`
+ 	if test -n "$curlconfig"; then
+ 	    CURL_CFLAGS=`$curlconfig --cflags`
+-	    CURL_LDFLAGS=`$curlconfig --libs`
++	    CURL_LIBS=`$curlconfig --libs`
+ 	else
+ 	    echo "cURL environment not found"
+ 	    exit 1
+@@ -532,7 +532,7 @@
+     return 0;
+ }
+ EOF
+-    if ! $cc $CFLAGS $CURL_CFLAGS $CURL_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
++    if ! $cc $CFLAGS $LDFLAGS $CURL_CFLAGS $TMPC -o $TMPE $CURL_LIBS > /dev/null 2>&1; then
+ 	echo "cURL environment not usable"
+ 	rm -f $TMPC
+ 	exit 1
+@@ -559,10 +559,6 @@
+ 	fi
+     fi
+ done
+-if test -z "$x_base_dir"; then
+-    echo "X11/Xt environment not found"
+-    exit 1
+-fi
+ 
+ # big/little endian test
+ cat > $TMPC << EOF
+@@ -763,12 +759,13 @@
+ echo "CC=$cc" >> $config_mak
+ echo "CXX=$cxx" >> $config_mak
+ echo "CFLAGS=$CFLAGS" >> $config_mak
++echo "LDFLAGS=$LDFLAGS" >> $config_mak
+ echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
+-echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
++echo "GLIB_LIBS=$GLIB_LIBS" >> $config_mak
+ echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak
+-echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak
++echo "GTK_LIBS=$GTK_LIBS" >> $config_mak
+ echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak
+-echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak
++echo "CURL_LIBS=$CURL_LIBS" >> $config_mak
+ if test "$build_biarch" = "yes"; then
+ echo "LDFLAGS_32=-m32" >> $config_mak
+ echo "CFLAGS_32=$CFLAGS_32" >> $config_mak
+--- Makefile
++++ Makefile
+@@ -51,16 +51,16 @@
+ endif
+ 
+ ifneq (,$(findstring $(OS),linux))
+-libdl_LDFLAGS = -ldl
++libdl_LIBS = -ldl
+ endif
+ 
+-libpthread_LDFLAGS = -lpthread
++libpthread_LIBS = -lpthread
+ ifeq ($(OS),dragonfly)
+ libpthread_LDFLAGS = -pthread
+ endif
+ 
+ ifneq (,$(findstring $(OS),solaris))
+-libsocket_LDFLAGS = -lsocket -lnsl
++libsocket_LIBS = -lsocket -lnsl
+ endif
+ 
+ PIC_CFLAGS = -fPIC
+@@ -71,7 +71,7 @@
+ endif
+ 
+ X_CFLAGS  = -I$(x11prefix)/include
+-X_LDFLAGS = -L$(x11prefix)/$(lib64) -lX11 -lXt
++X_LIBS = -L$(x11prefix)/$(lib64) -lX11 -lXt
+ ifneq (,$(findstring $(OS),netbsd dragonfly))
+ X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
+ endif
+@@ -107,8 +107,9 @@
+ npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
+ npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os)
+ npwrapper_CFLAGS  = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS)
+-npwrapper_LDFLAGS = $(X_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
+-npwrapper_LDFLAGS += $(GLIB_LDFLAGS)
++npwrapper_LDFLAGS = $(libpthread_LDFLAGS)
++npwrapper_LIBS = $(X_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
++npwrapper_LIBS += $(GLIB_LIBS)
+ 
+ npviewer_PROGRAM = npviewer.bin
+ npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c
+@@ -120,13 +121,14 @@
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0
+ npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
+-npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
++npviewer_LIBS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
+ else
+ npviewer_CFLAGS += $(GTK_CFLAGS)
+-npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS)
++npviewer_LIBS = $(GTK_LIBS) $(X_LIBS)
+ endif
+ npviewer_CFLAGS  += $(MOZILLA_CFLAGS)
+-npviewer_LDFLAGS += $(libdl_LDFLAGS) $(libpthread_LDFLAGS) -lgthread-2.0
++npviewer_LDFLAGS += $(libpthread_LDFLAGS)
++npviewer_LIBS += $(libdl_LIBS) $(libpthread_LIBS) -lgthread-2.0
+ ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
+ npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map
+ endif
+@@ -137,18 +139,19 @@
+ ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
+ npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp
+ npviewer_OBJECTS += npviewer-cxxabi-compat.o
+-npviewer_LDFLAGS += -lsupc++
++npviewer_LIBS += -lsupc++
+ endif
+ ifeq ($(TARGET_OS):$(TARGET_ARCH),solaris:i386)
+-npviewer_LDFLAGS += $(libsocket_LDFLAGS)
++npviewer_LIBS += $(libsocket_LIBS)
+ endif
+ 
+ npplayer_PROGRAM  = npplayer
+ npplayer_SOURCES  = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES)
+ npplayer_OBJECTS  = $(npplayer_SOURCES:%.c=npplayer-%.o)
+ npplayer_CFLAGS   = $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS)
+-npplayer_LDFLAGS  = $(GTK_LDFLAGS) $(CURL_LDFLAGS) $(X_LDFLAGS)
+-npplayer_LDFLAGS += -lgthread-2.0 $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
++npplayer_LDFLAGS  = $(libpthread_LDFLAGS)
++npplayer_LIBS  = $(GTK_LIBS) $(CURL_LIBS) $(X_LIBS)
++npplayer_LIBS += -lgthread-2.0 $(libpthread_LIBS) $(libsocket_LIBS)
+ 
+ libxpcom_LIBRARY = libxpcom.so
+ libxpcom_RAWSRCS = libxpcom.c debug.c
+@@ -174,12 +177,13 @@
+ npconfig_RAWSRCS = npw-config.c
+ npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
+ npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o)
+-npconfig_LDFLAGS = $(libdl_LDFLAGS)
++npconfig_LIBS = $(libdl_LIBS)
+ ifneq (,$(findstring $(OS),netbsd dragonfly))
+ # We will try to dlopen() the native plugin library. If that lib is
+ # linked against libpthread, then so must our program too.
+ # XXX use the ELF decoder for native plugins too?
+-npconfig_LDFLAGS += $(libpthread_LDFLAGS)
++npconfig_LDFLAGS = $(libpthread_LDFLAGS)
++npconfig_LIBS += $(libpthread_LIBS)
+ endif
+ 
+ nploader_PROGRAM = npviewer.sh
+@@ -192,7 +196,8 @@
+ test_rpc_client_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_CLIENT -DNPW_COMPONENT_NAME="\"Client\""
+ test_rpc_server_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_SERVER -DNPW_COMPONENT_NAME="\"Server\""
+ test_rpc_CFLAGS			 = -I$(SRC_PATH)/src $(GLIB_CFLAGS)
+-test_rpc_LDFLAGS		 = $(GLIB_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
++test_rpc_LIBS		 = $(GLIB_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
++test_rpc_LDFLAGS   = $(libpthread_LDFLAGS)
+ test_rpc_RAWPROGS		 = \
+ 	test-rpc-types \
+ 	test-rpc-nested-1 \
+@@ -364,13 +369,13 @@
+ 	svn commit -m "Generated by svn2cl." ChangeLog
+ 
+ $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
+-	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
++	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_LDFLAGS) $(LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LIBS)
+ 
+ npwrapper-%.os: $(SRC_PATH)/src/%.c
+ 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
+ 
+ $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
+-	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
++	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_LDFLAGS) $(LDFLAGS) $(npviewer_OBJECTS) $(npviewer_LIBS)
+ 
+ npviewer-%.o: $(SRC_PATH)/src/%.c
+ 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
+@@ -379,7 +384,7 @@
+ 	$(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
+ 
+ $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
+-	$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $(npplayer_LDFLAGS) $(npplayer_OBJECTS) $(npplayer_LIBS)
+ 
+ npplayer-%.o: $(SRC_PATH)/src/%.c
+ 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
+@@ -387,19 +392,19 @@
+ 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
+ 
+ $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
+-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
++	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_LDFLAGS) $(libxpcom_OBJECTS) $(libxpcom_LIBS) -Wl,$(LD_soname),libxpcom.so
+ 
+ libxpcom-%.o: $(SRC_PATH)/src/%.c
+ 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
+ 
+ $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
+-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
++	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_LDFLAGS) $(libnoxshm_OBJECTS) $(libnoxshm_LIBS) -Wl,$(LD_soname),libnoxshm.so
+ 
+ libnoxshm-%.o: $(SRC_PATH)/src/%.c
+ 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
+ 
+ $(npconfig_PROGRAM): $(npconfig_OBJECTS)
+-	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
++	$(CC) -o $@ $(npconfig_LDFLAGS) $(LDFLAGS) $(npconfig_OBJECTS) $(npconfig_LIBS)
+ 
+ npconfig-%.o: $(SRC_PATH)/src/%.c
+ 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
+@@ -425,18 +430,18 @@
+ 	$(LN_S) libgcc_s.so $@
+ 
+ $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
+-	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
++	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
+ 		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
+ 		-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
+ 
+ test-rpc-%-client: test-rpc-%-client.o $(test_rpc_client_OBJECTS)
+-	$(CC) -o $@ $< $(test_rpc_client_OBJECTS) $(test_rpc_LDFLAGS)
++	$(CC) $(test_rpc_LDFLAGS) -o $@ $< $(test_rpc_client_OBJECTS) $(test_rpc_LIBS)
+ test-rpc-%-client.o: $(SRC_PATH)/tests/test-rpc-%.c
+ 	$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS)
+ %-client.o: $(SRC_PATH)/src/%.c
+ 	$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS)
+ test-rpc-%-server: test-rpc-%-server.o $(test_rpc_server_OBJECTS)
+-	$(CC) -o $@ $< $(test_rpc_server_OBJECTS) $(test_rpc_LDFLAGS)
++	$(CC) $(test_rpc_LDFLAGS) -o $@ $< $(test_rpc_server_OBJECTS) $(test_rpc_LIBS)
+ test-rpc-%-server.o: $(SRC_PATH)/tests/test-rpc-%.c
+ 	$(CC) -o $@ -c $< $(test_rpc_server_CPPFLAGS) $(test_rpc_CFLAGS)
+ %-server.o: $(SRC_PATH)/src/%.c
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch
deleted file mode 100644
index e8922e651179..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up nspluginwrapper-1.3.0/configure.conf nspluginwrapper-1.3.0/configure
---- nspluginwrapper-1.3.0/configure.conf	2009-01-02 15:22:29.000000000 +0100
-+++ nspluginwrapper-1.3.0/configure	2009-01-07 12:06:21.000000000 +0100
-@@ -559,10 +559,6 @@ for dir in $x_base_dirs; do
- 	fi
-     fi
- done
--if test -z "$x_base_dir"; then
--    echo "X11/Xt environment not found"
--    exit 1
--fi
- 
- # big/little endian test
- cat > $TMPC << EOF
-@@ -763,6 +759,7 @@ echo "COMPILER=$compiler" >> $config_mak
- echo "CC=$cc" >> $config_mak
- echo "CXX=$cxx" >> $config_mak
- echo "CFLAGS=$CFLAGS" >> $config_mak
-+echo "LDFLAGS=$LDFLAGS" >> $config_mak
- echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
- echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
- echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch
deleted file mode 100644
index 13587225b484..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile
---- nspluginwrapper-1.3.0/Makefile.make	2009-01-02 15:22:29.000000000 +0100
-+++ nspluginwrapper-1.3.0/Makefile	2009-01-07 13:00:40.000000000 +0100
-@@ -364,13 +364,13 @@ changelog.commit: changelog
- 	svn commit -m "Generated by svn2cl." ChangeLog
- 
- $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
--	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
-+	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS)
- 
- npwrapper-%.os: $(SRC_PATH)/src/%.c
- 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
- 
- $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
-+	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS)
- 
- npviewer-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
-@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
- 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
- 
- $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
-+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
- 
- libxpcom-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
- 
- $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
-+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
- 
- libnoxshm-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
- 
- $(npconfig_PROGRAM): $(npconfig_OBJECTS)
--	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
-+	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS)
- 
- npconfig-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
-@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
- 	$(LN_S) libgcc_s.so $@
- 
- $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
--	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
-+	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
- 		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
- 		-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
-