Patch from Brian Bergstrand to use the correct -fPIC flag for

Darwin in order to get rid of the compiler warning.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index fd641481918496ee659ee02aee1375b1a3399d86..34d8b5a6782175c2853a3161f6503c918ddb5c23 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.bsd-lib, Makefile.darwin-lib: Define BSDLIB_PIC_FLAG
+               since Darwin requires -fPIC while NetBSD, FreeBSD,
+               et. al. requires -fpic.
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/Makefile.bsd-lib b/lib/Makefile.bsd-lib
index 38f22da38e4d3cb012e358c8c3987bc7e18dd482..61fee2b3f4bbcf2f7a7fcd5e4328472d03683040 100644 (file)
--- a/lib/Makefile.bsd-lib
+++ b/lib/Makefile.bsd-lib
@@ -18,6 +18,7 @@ pic:
        mkdir pic
 
 BSD_LIB = $(BSDLIB_IMAGE).so.$(BSDLIB_VERSION)
+BSDLIB_PIC_FLAG = -fpic
 
 image:         $(BSD_LIB)
 

diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib
index 77c5bac2714d8692bee28b08eba76e6801494183..84f05b8d4b97c7aba625af5bc126c15a040970a3 100644 (file)
--- a/lib/Makefile.darwin-lib
+++ b/lib/Makefile.darwin-lib
@@ -18,6 +18,7 @@ pic:
        mkdir pic
 
 BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
+BSDLIB_PIC_FLAG = -fPIC
 
 image:         $(BSD_LIB)
 

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index fb5fac79c5205b81a10574933a23e1c8ffc697ea..e09768e6dd03248c1ff0175e1c2c3c953763e604 100644 (file)
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
+               -fpic or -fPIC
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index fc6ecb2442e44211cad21ff0161c91eeba83fe8c..5e27184f6e50d4b3d8a8884990c2e5d34709cdad 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -60,7 +60,7 @@ DEPLIBS_BLKID=        $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
 @DLL_CMT@      (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@              -o jump/$*.o -c $<)
 @ELF_CMT@      $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 all:: $(SMANPAGES)
 

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index bd612e6686fc9cca4141098553717ce50ada98bb..d5c04e8a7c948584eaa743561f0ccba062074602 100644 (file)
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
+               -fpic or -fPIC
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index e29731558b9cd9f0107b6954b8aa4c90a3354f9a..f1e267b92405baeef8182dbe13ce38d1d933493c 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -68,7 +68,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @DLL_CMT@      (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@              -o jump/$*.o -c $<)
 @ELF_CMT@      $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 installdirs::
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \

diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index bf8e0a9a8d801ba6acc852caef8a6b5e5465f812..0c65ddae2bfa0c9f870edba1bf6ae9f482be9fbb 100644 (file)
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
+               -fpic or -fPIC
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 0b3b2ad95e0948587a478f72ce95f2db8d32ccea..26506c881548f22928b226eb933705df554c048e 100644 (file)
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -56,7 +56,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @DLL_CMT@      (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@              -o jump/$*.o -c $<)
 @ELF_CMT@      $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 @MAKEFILE_LIBRARY@
 @MAKEFILE_DLL@

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index e43116b555b278b4487e1fccf1d96b0af6504586..4737f3142676161d51c547281dd62685793e3365 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
+               -fpic or -fPIC
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 18fbe6353e133fe56b4dfc48c0116cd6da51e47d..f8b7acf5ee75d46c4d807edb824f7a0cb8e661af 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -170,7 +170,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @DLL_CMT@      (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@              -o jump/$*.o -c $<)
 @ELF_CMT@      $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 COMPILE_ET=../et/compile_et --build-tree
 

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 0164789ec6a86d3b3ccfd467e270d16ca22a33b5..0d1357e0955a5b90a644377c7079d8094310bfba 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
+               -fpic or -fPIC
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 6713febeda9ba42af06d3b9080d5979d2a3838e4..0999ebd1a4ff017432c20e6149c86be0af78ac2d 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -53,7 +53,7 @@ XTRA_CFLAGS= -I$(srcdir)/../et
 @DLL_CMT@      (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) \
 @DLL_CMT@              $(ALL_CFLAGS) -o jump/$*.o -c $<)
 @ELF_CMT@      $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 # for the library
 

diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index 01852025b9b5b95c9148fdbbf4fd8fefc855ff65..b3e9392a165476fbd22e4fbe58b0f95f3aded6a9 100644 (file)
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
+
+       * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
+               -fpic or -fPIC
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.35

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 0a6f796584d0e3f0df2ce438f6702217d53a22f8..ebcac04f52b037ac864211f09b1f5d73628abcb3 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -80,7 +80,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @DLL_CMT@      (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \
 @DLL_CMT@              -o jump/$*.o -c $<)
 @ELF_CMT@      $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+@BSDLIB_CMT@   $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 all:: tst_uuid uuid_time $(SMANPAGES)