Mercurial Mercurial > upstream > oracle > userland-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.
components/curl/patches/001-Makefile.in.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Wed, 13 Apr 2011 09:58:06 -0700
changeset 181 87e11e685b1f
parent 174 187aa0541610
permissions -rw-r--r--
7003927 userland should postprocess packaged files 7034188 userland should have common lint library rules 7034992 userland packages should include opensolaris.arc_url data 7019309 move ghostscript to userland (fix build)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- lib/Makefile.in	2010-10-01 13:49:18.000000000 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ lib/Makefile.in	2010-10-18 08:05:00.803406622 -0700
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -364,7 +364,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 @USE_EMBEDDED_ARES_TRUE@           -I$(top_builddir)/ares         \
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 @USE_EMBEDDED_ARES_TRUE@           -I$(top_srcdir)/ares
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
-@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 6:0:2
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 3:0:0
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
 #
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
 # Bumping of SONAME conditionally may seem like a weird thing to do, and yeah
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
@@ -375,7 +375,7 @@
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
 #
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 # This conditional soname bump SHOULD be removed at next "proper" bump.
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 #
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
-@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 7:0:2
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 3:0:0
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 # This flag accepts an argument of the form current[:revision[:age]]. So,
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
 # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
upstream/oracle/userland-gate