patch for Gluster build tested on fedora Core 4. ===File ~/pcre-fedora-build.diff============================ ? Makefile ? Makefile.in ? aclocal.m4 ? autom4te.cache ? config.log ? config.status ? configure ? pcre-fedora-build.diff ? tarballs ? doc/Makefile ? doc/Makefile.in ? extensions/bootdisk-manager/Makefile ? extensions/bootdisk-manager/Makefile.in ? extensions/bootp-manager/Makefile ? extensions/bootp-manager/Makefile.in ? extensions/client-boot/Makefile ? extensions/client-boot/Makefile.in ? extensions/client-reg/Makefile ? extensions/client-reg/Makefile.in ? extensions/core/Makefile ? extensions/core/Makefile.in ? extensions/ginstaller/Makefile ? extensions/ginstaller/Makefile.in ? extensions/gpartdump/Makefile ? extensions/gpartdump/Makefile.in ? extensions/mac-collector/Makefile ? extensions/mac-collector/Makefile.in Index: Makefile.am =================================================================== RCS file: /sources/gluster/gluster-alpha1/Makefile.am,v retrieving revision 1.2 diff -p -u -r1.2 Makefile.am --- Makefile.am 14 Feb 2006 05:34:53 -0000 1.2 +++ Makefile.am 20 Feb 2006 12:33:59 -0000 @@ -18,6 +18,8 @@ iso: $(CDRTOOLS_NATIVE) stage1 kernel-im all: iso +distclean: clean + clean: rm -rf iso_fs gluster-$(PACKAGE_VERSION)-$(ARCH).iso Index: autogen.sh =================================================================== RCS file: /sources/gluster/gluster-alpha1/autogen.sh,v retrieving revision 1.4 diff -p -u -r1.4 autogen.sh --- autogen.sh 14 Feb 2006 08:16:46 -0000 1.4 +++ autogen.sh 20 Feb 2006 12:33:59 -0000 @@ -4,6 +4,6 @@ aclocal autoconf automake --add-missing -mkdir -p tarballs -wget -Ptarballs/ -nH ftp://ftp.zresearch.com/pub/gluster/external/* +#mkdir -p tarballs +#wget -Ptarballs/ -nH ftp://ftp.zresearch.com/pub/gluster/external/* Index: stage2/pcre.mk =================================================================== RCS file: /sources/gluster/gluster-alpha1/stage2/pcre.mk,v retrieving revision 1.3 diff -p -u -r1.3 pcre.mk --- stage2/pcre.mk 7 Feb 2006 15:15:15 -0000 1.3 +++ stage2/pcre.mk 20 Feb 2006 12:34:00 -0000 @@ -1,11 +1,13 @@ pcre.%: PACKAGE_NAME=pcre-6.3 -pcre.%: CROSS_CONFIGURE_CMD=$(DEFAULT_CROSS_CONFIGURE_CMD) --disable-cpp +pcre.%: CROSS_CONFIGURE_CMD=./configure --prefix=$(DESTDIR_CROSS)/usr --disable-cpp --host=$(CROSS) --build=$(GLUSTER_BUILD) ## NOTE : pcre-config is used by apps which depend on pcre for determining ## the library and include paths of PCRE. The system's /usr/bin/pcre-config ## will confuse the cross build of grep. Below is a workaround by putting ## a dummy pcre-config into $(DESTDIR_NATIVE)/usr/bin which overrides all ## other PATHS -pcre.%: CROSS_INSTALL_CMD=$(DEFAULT_CROSS_INSTALL_CMD); mkdir -p $(DESTDIR_NATIVE)/usr/bin; echo > $(DESTDIR_NATIVE)/usr/bin/pcre-config; chmod +x $(DESTDIR_NATIVE)/usr/bin/pcre-config +##pcre.%: CROSS_INSTALL_CMD=$(DEFAULT_CROSS_INSTALL_CMD); mkdir -p $(DESTDIR_NATIVE)/usr/bin; echo > $(DESTDIR_NATIVE)/usr/bin/pcre-config; chmod +x $(DESTDIR_NATIVE)/usr/bin/pcre-config + +pcre.%: CROSS_INSTALL_CMD=$(MAKE) install DESTDIR=/;ls pcre-config | cpio -puvd $(DESTDIR_NATIVE)/usr/bin ============================================================
