[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2315: additional tweaking for bug 4161: also libgcc and pthread_nonshared for dso

[Mats Wichmann]

------------------------------------------------------------
revno: 2315
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2016-05-03 10:54:55 -0600
message:
  additional tweaking for bug 4161: also libgcc and pthread_nonshared for dso
modified:
  lsbdev-cc/lsbcc.c
  package/Makefile
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc.c'
--- a/lsbdev-cc/lsbcc.c	2016-05-03 14:06:42 +0000
+++ b/lsbdev-cc/lsbcc.c	2016-05-03 16:54:55 +0000
@@ -228,7 +228,7 @@
 	    if (strcmp(val, "pthread") == 0) {
 		if (lsbcc_debug & DEBUG_LIB_CHANGES)
 		    fprintf(stderr, "Appending -lpthread_nonshared\n");
-		argvaddstring(userlibs, "-lpthread_nonshared");
+		argvaddstring(syslibs, "-lpthread_nonshared");
 	    }
 
 	    return 1;
@@ -1892,6 +1892,7 @@
 	    fprintf(stderr, "Appending -lgcc\n");
 	}
 	argvaddstring(syslibs, "-lgcc");
+	argvaddstring(dsolibs, "-lgcc");	/* at least once for a DSO */
 	if (lsbcc_debug & DEBUG_LIB_CHANGES) {
 	    fprintf(stderr,
 		    "Appending -lm -lc -lc_nonshared -lgcc to the library list\n");
@@ -2039,6 +2040,7 @@
 	    }
 	    argvaddstring(syslibs, "-lpthread");
 	    argvaddstring(syslibs, "-lpthread_nonshared");
+	    argvaddstring(dsolibs, "-lpthread_nonshared");
 	}
 	if (!cc_is_icc) {
 	    argvappend(gccargs, proginterp);

=== modified file 'package/Makefile'
--- a/package/Makefile	2016-05-03 14:06:42 +0000
+++ b/package/Makefile	2016-05-03 16:54:55 +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=6
+BUILDNO=7
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)