Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=533f8783bb7b9805190c81af4b2e07b79b982f95
commit 533f8783bb7b9805190c81af4b2e07b79b982f95 Author: crazy <[email protected]> Date: Thu Jan 14 09:35:15 2016 +0100 xfsprogs-4.3.0-4-x86_64 * fix broken build system * thx Baste :) diff --git a/source/base/xfsprogs/FrugalBuild b/source/base/xfsprogs/FrugalBuild index 58ac5de..1421c48 100644 --- a/source/base/xfsprogs/FrugalBuild +++ b/source/base/xfsprogs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xfsprogs pkgver=4.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="XFS filesystem-specific static libraries and headers." url="http://xfs.org"; depends=('glibc>=2.22-7' 'libuuid>=2.27.1-4') @@ -12,13 +12,16 @@ groups=('base') archs=('i686' 'x86_64' 'arm') replaces=('xfsprogs-base') up2date="Flasttar ftp://oss.sgi.com/projects/xfs/cmd_tars"; -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${pkgver}.tar.gz) -signatures=("${source[0]}.sig") +source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${pkgver}.tar.gz \ + xfsprogs-4.3.0-sharedlibs.patch) +signatures=("${source[0]}.sig" '') build() { unset MAKEFLAGS export DEBUG="-DNDEBUG" export OPTIMIZER="-O1" + Fcd + Fpatchall Fconf --bindir=/bin \ --sbindir=/sbin \ --libexecdir=/usr/lib \ @@ -29,8 +32,8 @@ build() { --enable-static=no \ --disable-static make || Fdie - make DIST_ROOT=$Fdestdir install install-dev || Fdie + make -j1 DIST_ROOT=$Fdestdir install install-dev || Fdie ## FIXME: makepkg need that funtion also - __kill_libtool_dependency_libs + Ffix_la_files } diff --git a/source/base/xfsprogs/xfsprogs-4.3.0-sharedlibs.patch b/source/base/xfsprogs/xfsprogs-4.3.0-sharedlibs.patch new file mode 100644 index 0000000..a39af0d --- /dev/null +++ b/source/base/xfsprogs/xfsprogs-4.3.0-sharedlibs.patch @@ -0,0 +1,80 @@ +--- xfsprogs-4.3.0/include/buildmacros ++++ xfsprogs-4.3.0/include/buildmacros +@@ -70,18 +70,9 @@ + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ +- cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ +- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ +- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ +- fi ++ set -e; cd $(TOPDIR)/$(LIBNAME); \ ++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) + endif +--- xfsprogs-4.3.0/libxcmd/Makefile ++++ xfsprogs-4.3.0/libxcmd/Makefile +@@ -34,6 +34,9 @@ + + include $(BUILDRULES) + +-install install-dev: default ++install: default ++ ++install-dev: default ++ $(INSTALL_LTLIB_DEV) + + -include .ltdep +--- xfsprogs-4.3.0/libxfs/Makefile ++++ xfsprogs-4.3.0/libxfs/Makefile +@@ -138,6 +138,7 @@ + + install-dev: install + $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) ++ $(INSTALL_LTLIB_DEV) + + # We need to install the headers before building the dependencies. If we + # include the .ltdep file, the makefile decides that it needs to build the +--- xfsprogs-4.3.0/libxlog/Makefile ++++ xfsprogs-4.3.0/libxlog/Makefile +@@ -12,6 +12,8 @@ + + CFILES = xfs_log_recover.c util.c + ++LTLIBS = $(LIBUUID) $(LIBXFS) ++ + # don't want to link xfs_repair with a debug libxlog. + DEBUG = -DNDEBUG + +@@ -19,6 +21,9 @@ + + include $(BUILDRULES) + +-install install-dev: default ++install: default ++ ++install-dev: default ++ $(INSTALL_LTLIB_DEV) + + -include .ltdep +--- xfsprogs-4.3.0/Makefile ++++ xfsprogs-4.3.0/Makefile +@@ -82,6 +82,8 @@ + quota: libxcmd + repair: libxlog + copy: libxlog ++libxlog: libxfs ++libxlog-install-dev: libxfs-install-dev + + ifeq ($(HAVE_BUILDDEFS), yes) + include $(BUILDRULES) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
