Mercurial Mercurial > sustaining > oi_151a > sfw-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usr/src/cmd/cups/Patches/01-cups-config.patch
author Cyril Plisko <cyril.plisko@grigale.com>
Sat, 22 Jan 2011 12:27:08 -0800
changeset 64 707ce1130311
parent 60 0d167ac031c9
permissions -rw-r--r--
Import sfw build 158 Bugs Fixed ---------- 6955181 memcached denial-of-service 7007860 SFW still contains multiple references to /var/svc/manifest files that got moved to /lib 7009105 OPENSSL_VERSION_NUMBER changed format breaking ON build 7009580 preparations for upgrading to a new compiler 7009623 gld fails to execute 7010920 CUPS ships /var/run in error 7011373 time to update default package copyright again
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
60
0d167ac031c9 Import sfw build 156
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset 
     1
 
--- cups-config.in.orig	Tue Jun 15 17:49:01 2010
0d167ac031c9 Import sfw build 156
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset 
     2
 
+++ cups-config.in	Tue Dec  7 01:48:35 2010
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -113,7 +113,7 @@
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
 	    ;;
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 	--libs)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
 	    if test $static = no; then
60
0d167ac031c9 Import sfw build 156
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset 
     7
 
-	        libs="@EXTLINKCUPS@ $LIBS";
0d167ac031c9 Import sfw build 156
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset 
     8
 
+	        libs="@EXTLINKCUPS@"
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
 
  	        if test $image = yes; then
60
0d167ac031c9 Import sfw build 156
Cyril Plisko <cyril.plisko@grigale.com>
parents: 0
diff changeset 
    10
 
  	            libs="@EXTLINKCUPSIMAGE@ $libs"
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
 		fi
sustaining/oi_151a/sfw-gate