Author: tushar Date: 2005-06-14 13:11:20 -0600 (Tue, 14 Jun 2005) New Revision: 975
Added: trunk/tcl/tcl-8.4.10-threads_compile-1.patch trunk/zlib/zlib-1.2.2-fPIC-1.patch Removed: trunk/tcl/tcl-8.4.10-threads-compile.patch trunk/zlib/zlib-1.2.2-fPIC.patch Log: Conform to naming conventions Deleted: trunk/tcl/tcl-8.4.10-threads-compile.patch =================================================================== --- trunk/tcl/tcl-8.4.10-threads-compile.patch 2005-06-14 05:34:49 UTC (rev 974) +++ trunk/tcl/tcl-8.4.10-threads-compile.patch 2005-06-14 19:11:20 UTC (rev 975) @@ -1,29 +0,0 @@ -Submitted By: Tushar Teredesai <[EMAIL PROTECTED]> -Date: 2005-06-11 -Initial Package Version: 8.4.10 -Origin: TCL CVS -Upstream Status: In CVS -Description: Fix compilation when --enable-threads option is specified. -See <http://aspn.activestate.com/ASPN/Mail/Message/tcl-core/2619395>. - -diff -Naur tcl8.4.10.orig/unix/tclUnixNotfy.c tcl8.4.10/unix/tclUnixNotfy.c ---- tcl8.4.10.orig/unix/tclUnixNotfy.c 2005-06-01 18:12:21.000000000 +0000 -+++ tcl8.4.10/unix/tclUnixNotfy.c 2005-06-11 17:00:31.470883728 +0000 -@@ -275,7 +275,7 @@ - */ - - if (notifierCount == 0) { -- int result; -+ int result, ignored; - if (triggerPipe < 0) { - panic("Tcl_FinalizeNotifier: notifier pipe not initialized"); - } -@@ -294,7 +294,7 @@ - close(triggerPipe); - - Tcl_ConditionWait(¬ifierCV, ¬ifierMutex, NULL); -- result = Tcl_JoinThread(notifierThread); -+ result = Tcl_JoinThread(notifierThread, &ignored); - if (result) { - Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread"); - } Added: trunk/tcl/tcl-8.4.10-threads_compile-1.patch =================================================================== --- trunk/tcl/tcl-8.4.10-threads_compile-1.patch 2005-06-14 05:34:49 UTC (rev 974) +++ trunk/tcl/tcl-8.4.10-threads_compile-1.patch 2005-06-14 19:11:20 UTC (rev 975) @@ -0,0 +1,29 @@ +Submitted By: Tushar Teredesai <[EMAIL PROTECTED]> +Date: 2005-06-11 +Initial Package Version: 8.4.10 +Origin: TCL CVS +Upstream Status: In CVS +Description: Fix compilation when --enable-threads option is specified. +See <http://aspn.activestate.com/ASPN/Mail/Message/tcl-core/2619395>. + +diff -Naur tcl8.4.10.orig/unix/tclUnixNotfy.c tcl8.4.10/unix/tclUnixNotfy.c +--- tcl8.4.10.orig/unix/tclUnixNotfy.c 2005-06-01 18:12:21.000000000 +0000 ++++ tcl8.4.10/unix/tclUnixNotfy.c 2005-06-11 17:00:31.470883728 +0000 +@@ -275,7 +275,7 @@ + */ + + if (notifierCount == 0) { +- int result; ++ int result, ignored; + if (triggerPipe < 0) { + panic("Tcl_FinalizeNotifier: notifier pipe not initialized"); + } +@@ -294,7 +294,7 @@ + close(triggerPipe); + + Tcl_ConditionWait(¬ifierCV, ¬ifierMutex, NULL); +- result = Tcl_JoinThread(notifierThread); ++ result = Tcl_JoinThread(notifierThread, &ignored); + if (result) { + Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread"); + } Added: trunk/zlib/zlib-1.2.2-fPIC-1.patch =================================================================== --- trunk/zlib/zlib-1.2.2-fPIC-1.patch 2005-06-14 05:34:49 UTC (rev 974) +++ trunk/zlib/zlib-1.2.2-fPIC-1.patch 2005-06-14 19:11:20 UTC (rev 975) @@ -0,0 +1,93 @@ +Submitted By: Tushar Teredesai <[EMAIL PROTECTED]> +Date: 2005-06-14 +Initial Package Version: 1.2.2 +Origin: Gentoo ebuild? +Upstream Status: Not submitted +Description: + 1. Build shared and static lib in one pass + 2. Always add -fPIC when building shared lib, don't expect the user to set it. + +To build the shared and static library: + ./configure --prefix=<prefix> --shared && + make && + make install +Remove the --shared if you don't want the shared lib. + +diff -Naur zlib-1.2.2.orig/configure zlib-1.2.2/configure +--- zlib-1.2.2.orig/configure 2004-09-07 00:50:06.000000000 -0500 ++++ zlib-1.2.2/configure 2005-02-05 01:34:08.553292416 -0600 +@@ -73,7 +73,11 @@ + + if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then + CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} ++ #SFLAGS=${CFLAGS-"-fPIC -O3"} ++ # the above is horribly wrong on a few archs where -fPIC should ALWAYS be ++ # used in the creation of shared libraries. without the following, the ++ # shared lib test will sometimes fail even when shared libs -can- be created. ++ SFLAGS="${CFLAGS-"-O3"} -fPIC" + CFLAGS="$cflags" + case `(uname -s || echo unknown) 2>/dev/null` in + Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +@@ -158,7 +162,7 @@ + if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && + test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then + CFLAGS="$SFLAGS" +- LIBS="$SHAREDLIBV" ++ LIBS="$LIBS $SHAREDLIBV" + echo Building shared library $SHAREDLIBV with $CC. + elif test -z "$old_cc" -a -z "$old_cflags"; then + echo No shared library support. +diff -Naur zlib-1.2.2.orig/Makefile.in zlib-1.2.2/Makefile.in +--- zlib-1.2.2.orig/Makefile.in 2004-09-15 09:27:20.000000000 -0500 ++++ zlib-1.2.2/Makefile.in 2005-02-05 01:33:49.703158072 -0600 +@@ -49,6 +49,8 @@ + OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ + zutil.o inflate.o infback.o inftrees.o inffast.o + ++PIC_OBJS = $(OBJS:%.o=%.lo) ++ + OBJA = + # to use the asm code: make OBJA=match.o + +@@ -77,8 +79,11 @@ + mv _match.o match.o + rm -f _match.s + +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) ++%.lo: %.c ++ $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@ ++ ++$(SHAREDLIBV): $(PIC_OBJS) ++ $(LDSHARED) -o $@ $(PIC_OBJS) -lc + rm -f $(SHAREDLIB) $(SHAREDLIBM) + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIBM) +@@ -89,13 +94,10 @@ + minigzip$(EXE): minigzip.o $(LIBS) + $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) + +-install: $(LIBS) ++install-libs: $(LIBS) + [EMAIL PROTECTED] [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- [EMAIL PROTECTED] [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi + [EMAIL PROTECTED] [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi + [EMAIL PROTECTED] [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h + cp $(LIBS) $(libdir) + cd $(libdir); chmod 755 $(LIBS) + -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +@@ -110,6 +112,11 @@ + # The ranlib in install is needed on NeXTSTEP which checks file times + # ldconfig is for Linux + ++install: install-libs ++ [EMAIL PROTECTED] [ ! -d $(includedir) ]; then mkdir $(includedir); fi ++ cp zlib.h zconf.h $(includedir) ++ chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h ++ + uninstall: + cd $(includedir); \ + cd $(libdir); rm -f libz.a; \ Deleted: trunk/zlib/zlib-1.2.2-fPIC.patch =================================================================== --- trunk/zlib/zlib-1.2.2-fPIC.patch 2005-06-14 05:34:49 UTC (rev 974) +++ trunk/zlib/zlib-1.2.2-fPIC.patch 2005-06-14 19:11:20 UTC (rev 975) @@ -1,93 +0,0 @@ -Submitted By: Tushar Teredesai <[EMAIL PROTECTED]> -Date: 2005-06-14 -Initial Package Version: 1.2.2 -Origin: Gentoo ebuild? -Upstream Status: Not submitted -Description: - 1. Build shared and static lib in one pass - 2. Always add -fPIC when building shared lib, don't expect the user to set it. - -To build the shared and static library: - ./configure --prefix=<prefix> --shared && - make && - make install -Remove the --shared if you don't want the shared lib. - -diff -Naur zlib-1.2.2.orig/configure zlib-1.2.2/configure ---- zlib-1.2.2.orig/configure 2004-09-07 00:50:06.000000000 -0500 -+++ zlib-1.2.2/configure 2005-02-05 01:34:08.553292416 -0600 -@@ -73,7 +73,11 @@ - - if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then - CC="$cc" -- SFLAGS=${CFLAGS-"-fPIC -O3"} -+ #SFLAGS=${CFLAGS-"-fPIC -O3"} -+ # the above is horribly wrong on a few archs where -fPIC should ALWAYS be -+ # used in the creation of shared libraries. without the following, the -+ # shared lib test will sometimes fail even when shared libs -can- be created. -+ SFLAGS="${CFLAGS-"-O3"} -fPIC" - CFLAGS="$cflags" - case `(uname -s || echo unknown) 2>/dev/null` in - Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; -@@ -158,7 +162,7 @@ - if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && - test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then - CFLAGS="$SFLAGS" -- LIBS="$SHAREDLIBV" -+ LIBS="$LIBS $SHAREDLIBV" - echo Building shared library $SHAREDLIBV with $CC. - elif test -z "$old_cc" -a -z "$old_cflags"; then - echo No shared library support. -diff -Naur zlib-1.2.2.orig/Makefile.in zlib-1.2.2/Makefile.in ---- zlib-1.2.2.orig/Makefile.in 2004-09-15 09:27:20.000000000 -0500 -+++ zlib-1.2.2/Makefile.in 2005-02-05 01:33:49.703158072 -0600 -@@ -49,6 +49,8 @@ - OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ - zutil.o inflate.o infback.o inftrees.o inffast.o - -+PIC_OBJS = $(OBJS:%.o=%.lo) -+ - OBJA = - # to use the asm code: make OBJA=match.o - -@@ -77,8 +79,11 @@ - mv _match.o match.o - rm -f _match.s - --$(SHAREDLIBV): $(OBJS) -- $(LDSHARED) -o $@ $(OBJS) -+%.lo: %.c -+ $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@ -+ -+$(SHAREDLIBV): $(PIC_OBJS) -+ $(LDSHARED) -o $@ $(PIC_OBJS) -lc - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) -@@ -89,13 +94,10 @@ - minigzip$(EXE): minigzip.o $(LIBS) - $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) - --install: $(LIBS) -+install-libs: $(LIBS) - [EMAIL PROTECTED] [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -- [EMAIL PROTECTED] [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi - [EMAIL PROTECTED] [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi - [EMAIL PROTECTED] [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi -- cp zlib.h zconf.h $(includedir) -- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h - cp $(LIBS) $(libdir) - cd $(libdir); chmod 755 $(LIBS) - -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -@@ -110,6 +112,11 @@ - # The ranlib in install is needed on NeXTSTEP which checks file times - # ldconfig is for Linux - -+install: install-libs -+ [EMAIL PROTECTED] [ ! -d $(includedir) ]; then mkdir $(includedir); fi -+ cp zlib.h zconf.h $(includedir) -+ chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h -+ - uninstall: - cd $(includedir); \ - cd $(libdir); rm -f libz.a; \ -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
