Skip to contentSkip to conversation

xfsprogs: fix build with latest glibc headers

PATCH In review Eric Sandeen 2 participants 2 messages Jan 13, 2010

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

PATCH 1/1 xfsprogs: fix build with latest glibc headers

glibc in rawhide has some changes...

* Tue Jan 12 2010 Andreas Schwab <[email protected]> - 2.11.90-8
- Update from master.
- More POSIX conformance fixes.

* Mon Jan 11 2010 Andreas Schwab <[email protected]> - 2.11.90-6
- Update from master.
- POSIX conformance fixes (BZ#11125).

which seem to break the xfsprogs build. I'm no feature test macro guru, but the following gets it going again for me.

Signed-off-by Eric Sandeen <[email protected]>

---

include/builddefs.in +1 -1
index ca8f172..cc75b5d 100644
@@ -102,7 +102,7 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 #	   -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl
 
 ifeq ($(PKG_PLATFORM),linux)
-PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
+PCFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
 DEPENDFLAGS = -D__linux__
 endif
 ifeq ($(PKG_PLATFORM),darwin)
include/linux.h +1 -0
index dbfb4cf..b342e55 100644
@@ -22,6 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/sysmacros.h>
+#include <sys/stat.h>
 #include <malloc.h>
 #include <getopt.h>
 #include <endian.h>

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Eric Sandeen

glibc in rawhide has some changes...

* Tue Jan 12 2010 Andreas Schwab <[email protected]> - 2.11.90-8
- Update from master.
- More POSIX conformance fixes.

* Mon Jan 11 2010 Andreas Schwab <[email protected]> - 2.11.90-6
- Update from master.
- POSIX conformance fixes (BZ#11125).

Great, eh? :)

include/builddefs.in GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall · line 105

Quoted 6 lines
include/builddefs.in +1 -1
@@ -102,7 +102,7 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 #	   -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl
 
 ifeq ($(PKG_PLATFORM),linux)
-PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
+PCFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)

We might aswell got to -D_XOPEN_SOURCE=700 which is the newest revision and should give us just about everything we might need.

But generally this looks okay to me,

Reviewed-by Christoph Hellwig <[email protected]>

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs