[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2313: fix place Bdynamic is emitted after recent changes

Mats Wichmann mats at linuxfoundation.org
Mon May 2 16:30:19 UTC 2016


------------------------------------------------------------
revno: 2313
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2016-05-02 10:30:19 -0600
message:
  fix place Bdynamic is emitted after recent changes
modified:
  lsbdev-cc/lsbcc.c
  package/Makefile
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc.c'
--- a/lsbdev-cc/lsbcc.c	2016-04-25 15:32:26 +0000
+++ b/lsbdev-cc/lsbcc.c	2016-05-02 16:30:19 +0000
@@ -2020,18 +2020,19 @@
 	    argvaddstring(gccargs, "-lirc");
 	}
 
+	if (!b_dynamic && !force_static) {
+	    if (lsbcc_debug & DEBUG_LIB_CHANGES)
+		fprintf(stderr, "Inserting -Wl,-Bdynamic\n");
+	    argvaddstring(gccargs, "-Wl,-Bdynamic");
+	    b_dynamic = 1;
+	}
+
 	/* force pthread always */
 	if (auto_pthread) {
 	    if (lsbcc_debug & DEBUG_LIB_CHANGES) {
 		fprintf(stderr,
 			"Appending -lpthread -lpthread_nonshared to the library list due to auto_pthread\n");
 	    }
-	    if (!b_dynamic && !force_static) {
-		if (lsbcc_debug & DEBUG_LIB_CHANGES)
-		    fprintf(stderr, "Inserting -Wl,-Bdynamic\n");
-		argvaddstring(syslibs, "-Wl,-Bdynamic");
-		b_dynamic = 1;
-	    }
 	    argvaddstring(syslibs, "-lpthread");
 	    argvaddstring(syslibs, "-lpthread_nonshared");
 	}

=== modified file 'package/Makefile'
--- a/package/Makefile	2016-04-25 15:32:26 +0000
+++ b/package/Makefile	2016-05-02 16:30:19 +0000
@@ -54,7 +54,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-BUILDNO=4
+BUILDNO=5
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list