rpms/libjpeg/devel libjpeg-cflags.patch, NONE, 1.1 jpeg-cflags.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3293

Added Files:
	libjpeg-cflags.patch 
Removed Files:
	jpeg-cflags.patch 
Log Message:
fix up patch


libjpeg-cflags.patch:
 ltconfig     |    2 +-
 makefile.cfg |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libjpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
--- jpeg-6b/ltconfig.BAD	2006-07-10 17:33:04.000000000 -0400
+++ jpeg-6b/ltconfig	2006-07-10 17:33:18.000000000 -0400
@@ -760,7 +760,7 @@
 
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+      archive_cmds='$CC $CFLAGS -shared ${wl}-soname $wl$soname -o $lib$libobjs'
     else
       ld_shlibs=no
     fi


--- jpeg-cflags.patch DELETED ---