[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2317: whitespace only (consistency)

Mats Wichmann mats at linuxfoundation.org
Tue May 3 21:52:49 UTC 2016


------------------------------------------------------------
revno: 2317
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2016-05-03 15:52:49 -0600
message:
  whitespace only (consistency)
modified:
  lsbdev-cc/lsbcc.c
  package/Makefile
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc.c'
--- a/lsbdev-cc/lsbcc.c	2016-05-03 18:18:45 +0000
+++ b/lsbdev-cc/lsbcc.c	2016-05-03 21:52:49 +0000
@@ -233,7 +233,7 @@
 	    }
 
 	    return 1;
-        }
+	}
     }
 
     /* 
@@ -326,7 +326,7 @@
 		"Warning: Shared library %s does not follow the libfoo.so convention\n",
 		optarg);
 	CloseElfFile(efile);
-        free (libdir);
+	free (libdir);
 	return 0;
     }
     *tmp = '\0';
@@ -783,11 +783,11 @@
 	if (lsb_module->lib_names == NULL)
 	    continue;
 	modules = realloc(modules, (modules ? strlen(modules) : 0) +
-			            strlen(lsb_module->module_name) + 2);
+				    strlen(lsb_module->module_name) + 2);
 	strcat(modules, lsb_module->module_name);
     }
     if (!modules)
-        modules = strdup("None");
+	modules = strdup("None");
     return modules;
 }
 
@@ -1332,7 +1332,7 @@
      * not prefer the former, but accept both to not silently fail things
      */
     if ((ptr = getenv("LSBCC_SHAREDLIBPATH")) != NULL ||
-        (ptr = getenv("LSB_SHAREDLIBPATH")) != NULL) {
+	(ptr = getenv("LSB_SHAREDLIBPATH")) != NULL) {
 	process_shared_lib_path(strdup(ptr));
     }
 
@@ -1562,14 +1562,14 @@
 		 * so we don't know where to put this. We have to solve
 		 * this by deferring processing.
 		 */
-	        if (strstr(argv[optind - 1], "whole-archive") != NULL) {
+		if (strstr(argv[optind - 1], "whole-archive") != NULL) {
 		    whole_archive_seen = 1;
 		    whole_archive_emitted = 0;
 		}
-	        if (strstr(argv[optind - 1], "no-whole-archive") != NULL) {
+		if (strstr(argv[optind - 1], "no-whole-archive") != NULL) {
 		    if (whole_archive_list) {
-		        if (lsbcc_debug & DEBUG_RECOGNIZED_ARGS)
-		            fprintf(stderr, "option: %s\n", argv[optind - 1]);
+			if (lsbcc_debug & DEBUG_RECOGNIZED_ARGS)
+			    fprintf(stderr, "option: %s\n", argv[optind - 1]);
 			argvaddstring(whole_archive_list, argv[optind - 1]);
 			whole_archive_list = NULL;
 		    }
@@ -1757,8 +1757,8 @@
      */
     for (i = 0; lsb_version_include_paths[lsbversion_index][i] != NULL; i++) {
       if (lsbcc_debug & DEBUG_INCLUDE_CHANGES)
-        fprintf(stderr, "Prepending %s to system include path\n", 
-                        lsb_version_include_paths[lsbversion_index][i]);
+	fprintf(stderr, "Prepending %s to system include path\n", 
+			lsb_version_include_paths[lsbversion_index][i]);
       argvadd(incpaths, "I", lsb_version_include_paths[lsbversion_index][i]);
     }
 

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