Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7070613 (Un)Zip is compiled with gcc in Userland.
authorJiri Sasek <Jiri.Sasek@Sun.COM>
Thu, 28 Jul 2011 09:22:58 -0700
changeset 438 e8c5625b8284
parent 437 1b84695d4fb4
child 439 158daa600b9e
7070613 (Un)Zip is compiled with gcc in Userland.
components/unzip/Makefile file | annotate | diff | comparison | revisions
components/unzip/patches/unix-configure.patch file | annotate | diff | comparison | revisions
components/zip/Makefile file | annotate | diff | comparison | revisions
components/zip/patches/00-unix-configure.patch file | annotate | diff | comparison | revisions 
--- a/components/unzip/Makefile	Thu Jul 28 05:42:15 2011 -0700
+++ b/components/unzip/Makefile	Thu Jul 28 09:22:58 2011 -0700
@@ -44,7 +44,7 @@
 
 # The Makefile we want is under unix/Makefile
 COMPONENT_BUILD_ARGS += -f unix/Makefile
-COMPONENT_BUILD_TARGETS += generic
+COMPONENT_BUILD_TARGETS += generic CC="$(CC)"
 COMPONENT_INSTALL_ARGS += -f unix/Makefile
 
 # This doesn't respect DESTDIR, so overload BINDIR and MANDIR when we install.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/unzip/patches/unix-configure.patch	Thu Jul 28 09:22:58 2011 -0700
@@ -0,0 +1,11 @@
+--- unzip60/unix/configure.bkp	2011-07-28 07:07:08.691240200 -0700
++++ unzip60/unix/configure	2011-07-28 07:07:47.315977300 -0700
[email protected]@ -646,7 +646,7 @@
+ 
+ 
+ echo CC=\"${CC}\" CF=\"${CFLAGSR} ${D_USE_BZ2}\" CRCA_O=\"${CRC32OA}\" \
+-       AS=\"${CC} -c\" LFLAGS1=\"${LFLAGS1}\" LF2=\"${LFLAGS2}\" \
++       AS=\"${CC} -c\" LFLAGS1=\"${LFLAGS1} ${LD_OPTIONS}\" LF2=\"${LFLAGS2}\" \
+        CC_BZ=\"${CC_BZ}\" CFLAGS_BZ=\"${CFLAGS_BZ}\" \
+        IZ_BZIP2=\"${IZ_BZIP2}\" D_USE_BZ2=\"${D_USE_BZ2}\" \
+        L_BZ2=\"${L_BZ2}\" LIBBZ2=\"${LIBBZ2}\"  > flags
--- a/components/zip/Makefile	Thu Jul 28 05:42:15 2011 -0700
+++ b/components/zip/Makefile	Thu Jul 28 09:22:58 2011 -0700
@@ -40,7 +40,7 @@
 
 # The Makefile we want is under unix/Makefile
 COMPONENT_BUILD_ARGS += -f unix/Makefile
-COMPONENT_BUILD_TARGETS += generic
+COMPONENT_BUILD_TARGETS += generic CC=$(CC)
 COMPONENT_INSTALL_ARGS += -f unix/Makefile
 
 # This doesn't respect DESTDIR, so overload BINDIR and MANDIR when we install.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/zip/patches/00-unix-configure.patch	Thu Jul 28 09:22:58 2011 -0700
@@ -0,0 +1,11 @@
+--- zip30/unix/configure.bkp	2011-07-28 06:55:25.022477000 -0700
++++ zip30/unix/configure	2011-07-28 06:56:16.658236300 -0700
[email protected]@ -688,7 +688,7 @@
+ 
+ echo CC=\"${CC}\" CFLAGS=\"${CFLAGS}\"  CPP=\"${CPP}\" OBJA=\"${OBJA}\" \
+        OCRCU8=\"${OCRCU8}\" OCRCTB=\"${OCRCTB}\" \
+-       BINDIR=${BINDIR} MANDIR=${MANDIR} LFLAGS1=\"${LFLAGS1}\" \
++       BINDIR=${BINDIR} MANDIR=${MANDIR} LFLAGS1=\"${LFLAGS1} ${LD_OPTIONS}\" \
+        LFLAGS2=\"${LFLAGS2}\" LN=\"${LN}\" \
+        CC_BZ=\"${CC_BZ}\" CFLAGS_BZ=\"${CFLAGS_BZ}\" \
+        IZ_BZIP2=\"${IZ_BZIP2}\" LIB_BZ=\"${LIB_BZ}\" > flags
upstream/oracle/userland-gate