diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1 new file mode 100644 index 0000000000..c795821e61 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.17.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare setup +DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext ) -DESCRIPTION=xfs filesystem utilities -EAPI=5 -HOMEPAGE=http://oss.sgi.com/projects/xfs/ -IUSE=libedit nls readline static static-libs -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 -LICENSE=LGPL-2.1 -RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext ) -DESCRIPTION=xfs filesystem utilities -EAPI=5 -HOMEPAGE=http://oss.sgi.com/projects/xfs/ -IUSE=libedit nls readline static static-libs -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=LGPL-2.1 -RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext ) -DESCRIPTION=xfs filesystem utilities -EAPI=5 -HOMEPAGE=http://oss.sgi.com/projects/xfs/ -IUSE=libedit nls readline static static-libs -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=LGPL-2.1 -RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext ) -DESCRIPTION=xfs filesystem utilities -EAPI=5 -HOMEPAGE=http://oss.sgi.com/projects/xfs/ -IUSE=libedit nls readline static static-libs -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=LGPL-2.1 -RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) ! -Date: Fri, 3 Jun 2016 09:17:28 -0700 -Subject: [PATCH] Allow compiling xfsprogs in a cross compile environment. - -Without this patch, we are using the same compiler and options for the host -compiler (BUILD_CC) and the target compiler (CC), and we would get error -messages at compilation: -x86_64-pc-linux-gnu-gcc -O2 -O2 -pipe -march=armv7-a -mtune=cortex-a15 ... -x86_64-pc-linux-gnu-gcc.real: error: unrecognized command line option -'-mfpu=neon' -'-mfloat-abi=hard' -'-clang-syntax' -'-mfpu=neon' -'-mfloat-abi=hard' -'-clang-syntax' - -Add BUILD_CC and BUILD_CFLAGS as precious variables to allow setting it up -from the ebuild. - -Signed-off-by: Gwendal Grignou ---- - configure | 26 +++++++++++++++++++++----- - configure.ac | 20 +++++++++++++++----- - include/builddefs.in | 6 ++++-- - libxfs/Makefile | 4 ++-- - 4 files changed, 42 insertions(+), 14 deletions(-) - -diff --git a/configure b/configure -index 325081f..863a447 100755 ---- a/configure -+++ b/configure -@@ -700,6 +700,7 @@ libreadline - enable_blkid - enable_gettext - enable_shared -+BUILD_CFLAGS - BUILD_CC - CPP - LT_SYS_LIBRARY_PATH -@@ -806,7 +807,9 @@ LDFLAGS - LIBS - CPPFLAGS - LT_SYS_LIBRARY_PATH --CPP' -+CPP -+BUILD_CC -+BUILD_CFLAGS' - - - # Initialize some variables set by options. -@@ -1456,6 +1459,9 @@ Some influential environment variables: - LT_SYS_LIBRARY_PATH - User-defined run-time library search path. - CPP C preprocessor -+ BUILD_CC C compiler for build tools -+ BUILD_CFLAGS -+ C compiler flags for build tools - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -11957,11 +11963,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --if test $cross_compiling = no; then -- BUILD_CC="$CC" - --else -- for ac_prog in gcc cc -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ for ac_prog in gcc cc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -12003,6 +12010,15 @@ fi - test -n "$BUILD_CC" && break - done - -+ fi -+fi -+ -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - # Check whether --enable-shared was given. -diff --git a/configure.ac b/configure.ac -index d44438f..fc286b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,11 +9,21 @@ AC_PREFIX_DEFAULT(/usr) - AC_PROG_LIBTOOL - - AC_PROG_CC --if test $cross_compiling = no; then -- BUILD_CC="$CC" -- AC_SUBST(BUILD_CC) --else -- AC_CHECK_PROGS(BUILD_CC, gcc cc) -+AC_ARG_VAR(BUILD_CC, [C compiler for build tools]) -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ AC_CHECK_PROGS(BUILD_CC, gcc cc) -+ fi -+fi -+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools]) -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - AC_ARG_ENABLE(shared, -diff --git a/include/builddefs.in b/include/builddefs.in -index c2ca4cb..9ca57a6 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -27,6 +27,7 @@ MALLOCLIB = @malloc_lib@ - LOADERFLAGS = @LDFLAGS@ - LTLDFLAGS = @LDFLAGS@ - CFLAGS = @CFLAGS@ -+BUILD_CFLAGS = @BUILD_CFLAGS@ - - LIBRT = @librt@ - LIBUUID = @libuuid@ -@@ -150,7 +151,7 @@ PCFLAGS+= -DENABLE_BLKID - endif - - --GCFLAGS = $(OPTIMIZER) $(DEBUG) \ -+GCFLAGS = $(DEBUG) \ - -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ - -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs - -@@ -158,8 +159,9 @@ ifeq ($(ENABLE_GETTEXT),yes) - GCFLAGS += -DENABLE_GETTEXT - endif - -+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) - # First, Global, Platform, Local CFLAGS --CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) -+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) - - include $(TOPDIR)/include/buildmacros - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 873d4ec..8d728c0 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory --- -2.8.0.rc3.226.g39d4020 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch deleted file mode 100644 index a39af0d8cb..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- 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) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch deleted file mode 100644 index 9912e49ebf..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2212e8bb59e7c3930d49da2ec5f4f0a9ceb086c7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 8 Apr 2016 16:41:31 -0400 -Subject: [PATCH] po: respect LINGUAS build setting - -It is common gettext practice to limit the translations a particular -package will include by setting the LINGUAS environment variable. - -Signed-off-by: Mike Frysinger ---- - po/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/po/Makefile b/po/Makefile -index edf92ad..a5250b3 100644 ---- a/po/Makefile -+++ b/po/Makefile -@@ -6,7 +6,10 @@ TOPDIR = .. - include $(TOPDIR)/include/builddefs - - POTHEAD = $(PKG_NAME).pot --LINGUAS = de pl -+# If the user has requested a specific set of translations, only build those. -+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po)) -+LINGUAS ?= $(SUPPORTED_LINGUAS) -+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS)) - LSRCFILES = $(LINGUAS:%=%.po) - LDIRT = $(POTHEAD) - --- -2.7.4 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch deleted file mode 100644 index 77ded5393d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d01d3689fd512811b9d860598ddf26089bb5955c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 9 Aug 2016 22:37:45 +0800 -Subject: [PATCH xfsprogs] libxcmd: link against used libs - -Since this lib uses symbols from libxfs (platform_findsizes) and many -symbols from libblkid, link against both. Otherwise, the resulting -shared lib has missing symbols which makes linking against annoying. - -Signed-off-by: Mike Frysinger ---- - libxcmd/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libxcmd/Makefile b/libxcmd/Makefile -index aab8d6d63624..46ba138a37e2 100644 ---- a/libxcmd/Makefile -+++ b/libxcmd/Makefile -@@ -12,6 +12,8 @@ LT_AGE = 0 - - CFILES = command.c input.c paths.c projects.c help.c quit.c topology.c - -+LTLIBS = $(LIBXFS) $(LIBBLKID) -+ - ifeq ($(HAVE_GETMNTENT),yes) - LCFLAGS += -DHAVE_GETMNTENT - endif --- -2.9.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch deleted file mode 100644 index f4232b3445..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- xfsprogs-4.9.0/configure -+++ xfsprogs-4.9.0/configure -@@ -861,6 +861,7 @@ - enable_blkid - enable_gettext - enable_shared -+BUILD_CFLAGS - BUILD_CC - CPP - OTOOL64 -@@ -960,7 +961,9 @@ - LDFLAGS - LIBS - CPPFLAGS --CPP' -+CPP -+BUILD_CC -+BUILD_CFLAGS' - - - # Initialize some variables set by options. -@@ -1616,6 +1619,9 @@ - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor -+ BUILD_CC C compiler for build tools -+ BUILD_CFLAGS -+ C compiler flags for build tools - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -11116,11 +11122,12 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --if test $cross_compiling = no; then -- BUILD_CC="$CC" - --else -- for ac_prog in gcc cc -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ for ac_prog in gcc cc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -11162,6 +11169,15 @@ - test -n "$BUILD_CC" && break - done - -+ fi -+fi -+ -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - # Check whether --enable-shared was given. ---- xfsprogs-4.9.0/configure.ac -+++ xfsprogs-4.9.0/configure.ac -@@ -9,11 +9,21 @@ - AC_PROG_LIBTOOL - - AC_PROG_CC --if test $cross_compiling = no; then -- BUILD_CC="$CC" -- AC_SUBST(BUILD_CC) --else -- AC_CHECK_PROGS(BUILD_CC, gcc cc) -+AC_ARG_VAR(BUILD_CC, [C compiler for build tools]) -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ AC_CHECK_PROGS(BUILD_CC, gcc cc) -+ fi -+fi -+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools]) -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - AC_ARG_ENABLE(shared, ---- xfsprogs-4.9.0/include/builddefs.in -+++ xfsprogs-4.9.0/include/builddefs.in -@@ -26,6 +26,7 @@ - LOADERFLAGS = @LDFLAGS@ - LTLDFLAGS = @LDFLAGS@ - CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -+BUILD_CFLAGS = @BUILD_CFLAGS@ - - LIBRT = @librt@ - LIBUUID = @libuuid@ -@@ -154,7 +155,7 @@ - endif - - --GCFLAGS = $(OPTIMIZER) $(DEBUG) \ -+GCFLAGS = $(DEBUG) \ - -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ - -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs - -@@ -162,8 +163,9 @@ - GCFLAGS += -DENABLE_GETTEXT - endif - -+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) - # First, Global, Platform, Local CFLAGS --CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) -+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) - - include $(TOPDIR)/include/buildmacros - ---- xfsprogs-4.9.0/libxfs/Makefile -+++ xfsprogs-4.9.0/libxfs/Makefile -@@ -124,7 +124,7 @@ - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -135,7 +135,7 @@ - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild index 600fdc7fa5..8e1861b25c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild @@ -1,37 +1,32 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -inherit eutils toolchain-funcs multilib +inherit toolchain-funcs multilib systemd DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" +HOMEPAGE="https://xfs.wiki.kernel.org/" +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" +IUSE="icu libedit nls readline static-libs" LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] + icu? ( dev-libs/icu:=[static-libs(+)] ) readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) +RDEPEND="${LIB_DEPEND//\[static-libs(+)]} !=xfsprogs-3.2.0 + emake -j1 DIST_ROOT="${ED}" install-dev + + # handle is for xfsdump, the rest for xfsprogs + gen_usr_ldscript -a handle xcmd xfs xlog frog + # removing unnecessary .la files if not needed + if ! use static-libs ; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild deleted file mode 100644 index e5776a1bb9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild deleted file mode 100644 index 99369e59c6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="libedit nls readline static static-libs" -REQUIRED_USE="static? ( static-libs )" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - !=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-dev - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a handle xcmd xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -}