[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2316: a few little cleanups

Mats Wichmann mats at linuxfoundation.org
Tue May 3 18:18:45 UTC 2016


------------------------------------------------------------
revno: 2316
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2016-05-03 12:18:45 -0600
message:
  a few little cleanups
modified:
  lsbdev-cc/lsbcc.c
  package/Makefile
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc.c'
--- a/lsbdev-cc/lsbcc.c	2016-05-03 16:54:55 +0000
+++ b/lsbdev-cc/lsbcc.c	2016-05-03 18:18:45 +0000
@@ -229,6 +229,7 @@
 		if (lsbcc_debug & DEBUG_LIB_CHANGES)
 		    fprintf(stderr, "Appending -lpthread_nonshared\n");
 		argvaddstring(syslibs, "-lpthread_nonshared");
+		argvaddstring(dsolibs, "-lpthread_nonshared");
 	    }
 
 	    return 1;
@@ -1889,13 +1890,14 @@
 	}
 
 	if (lsbcc_debug & DEBUG_LIB_CHANGES) {
-	    fprintf(stderr, "Appending -lgcc\n");
+	    fprintf(stderr, "Appending -lgcc to the library list\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");
+		    "Appending -lm -lc -lc_nonshared to the library list\n");
 	}
 	argvaddstring(syslibs, "-lm");
 	argvaddstring(syslibs, "-lc");
@@ -1981,10 +1983,6 @@
 
 	argvappend(gccargs, options);
 
-	if (lsbcc_debug & DEBUG_LIB_CHANGES) {
-	    fprintf(stderr,
-		    "Turning off default libraries with -nodefaultlibs\n");
-	}
 
 	if (!no_link) {
 	    /*
@@ -1995,7 +1993,13 @@
 		argvappend(gccargs, proginterp);
 	    }
 
+	    if (lsbcc_debug & DEBUG_LIB_CHANGES) {
+		fprintf(stderr,
+			"Turning off default libraries with -nodefaultlibs\n");
+	    }
+	    /* note implies have to manaully include -lgcc for a GCC compiler */
 	    argvaddstring(gccargs, "-nodefaultlibs");
+
 	    if (lsbcc_debug & DEBUG_LIB_CHANGES) {
 		fprintf(stderr, "Prepending %s to the linker path\n",
 			libpath);

=== modified file 'package/Makefile'
--- a/package/Makefile	2016-05-03 16:54:55 +0000
+++ b/package/Makefile	2016-05-03 18:18:45 +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=7
+BUILDNO=8
 
 # 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