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 fd64148..34d8b5a 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 38f22da..61fee2b 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 77c5bac..84f05b8 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 fb5fac7..e09768e 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 fc6ecb2..5e27184 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 bd612e6..d5c04e8 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 e297315..f1e267b 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 bf8e0a9..0c65dda 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 0b3b2ad..26506c8 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 e43116b..4737f31 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 18fbe63..f8b7acf 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 0164789..0d1357e 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 6713feb..0999ebd 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 0185202..b3e9392 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 0a6f796..ebcac04 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)