diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 31fb59aeda..dd3ae78df0 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="glibc" -PKG_VERSION="2.24" +PKG_VERSION="2.25" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libc/" @@ -62,10 +62,6 @@ fi NSS_CONF_DIR="$PKG_BUILD/nss" -GLIBC_EXCLUDE_BIN="catchsegv gencat getconf iconv iconvconfig ldconfig" -GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN makedb mtrace pcprofiledump" -GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof xtrace" - pre_build_target() { cd $PKG_BUILD aclocal --force --verbose @@ -115,16 +111,13 @@ echo "libdir=/usr/lib" >> configparms echo "slibdir=/usr/lib" >> configparms echo "sbindir=/usr/bin" >> configparms echo "rootsbindir=/usr/bin" >> configparms +echo "build-programs=no" >> configparms } post_makeinstall_target() { # we are linking against ld.so, so symlink ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so -# cleanup - for i in $GLIBC_EXCLUDE_BIN; do - rm -rf $INSTALL/usr/bin/$i - done rm -rf $INSTALL/usr/lib/audit rm -rf $INSTALL/usr/lib/glibc rm -rf $INSTALL/usr/lib/libc_pic diff --git a/packages/network/libnfs/patches/libnfs-glibc-2.25.patch b/packages/network/libnfs/patches/libnfs-glibc-2.25.patch new file mode 100644 index 0000000000..f32dca8da7 --- /dev/null +++ b/packages/network/libnfs/patches/libnfs-glibc-2.25.patch @@ -0,0 +1,41 @@ +From 5b28ab5d535e0252c05640eef6e280581278dc36 Mon Sep 17 00:00:00 2001 +From: Ronnie Sahlberg +Date: Tue, 9 May 2017 14:30:14 -0700 +Subject: [PATCH] Include sys/sysmacros.h on platforms that have it + +This addresses issue 202 + +Signed-off-by: Ronnie Sahlberg +--- + configure.ac | 4 ++++ + lib/libnfs.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ad7e63f..574aa4a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -112,6 +112,10 @@ esac + AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") + AC_SUBST([LIBSOCKET]) + ++# check for sys/sysmacros.h ++dnl Check for sys/sysmacros.h ++AC_CHECK_HEADERS([sys/sysmacros.h]) ++ + # check for poll.h + dnl Check for poll.h + AC_CHECK_HEADERS([poll.h]) +diff --git a/lib/libnfs.c b/lib/libnfs.c +index d7a3d49..880ba85 100755 +--- a/lib/libnfs.c ++++ b/lib/libnfs.c +@@ -71,7 +71,7 @@ + #include + #endif + +-#ifdef MAJOR_IN_SYSMACROS ++#ifdef HAVE_SYS_SYSMACROS_H + #include + #endif + diff --git a/packages/x11/other/fontconfig/patches/fontconfig-01-avoid-conflicts-with-integer-width-macros.patch b/packages/x11/other/fontconfig/patches/fontconfig-01-avoid-conflicts-with-integer-width-macros.patch new file mode 100644 index 0000000000..cad71707ad --- /dev/null +++ b/packages/x11/other/fontconfig/patches/fontconfig-01-avoid-conflicts-with-integer-width-macros.patch @@ -0,0 +1,72 @@ +From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 11 Dec 2016 14:32:00 -0800 +Subject: [PATCH] Avoid conflicts with integer width macros from TS + 18661-1:2014 + +glibc 2.25+ has now defined these macros in +https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + fontconfig/fontconfig.h | 2 +- + src/fcobjs.h | 2 +- + src/fcobjshash.gperf | 2 +- + src/fcobjshash.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +Index: fontconfig-2.12.1/fontconfig/fontconfig.h +=================================================================== +--- fontconfig-2.12.1.orig/fontconfig/fontconfig.h ++++ fontconfig-2.12.1/fontconfig/fontconfig.h +@@ -128,7 +128,8 @@ typedef int FcBool; + #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION + + /* Adjust outline rasterizer */ +-#define FC_CHAR_WIDTH "charwidth" /* Int */ ++#define FC_CHARWIDTH "charwidth" /* Int */ ++#define FC_CHAR_WIDTH FC_CHARWIDTH + #define FC_CHAR_HEIGHT "charheight"/* Int */ + #define FC_MATRIX "matrix" /* FcMatrix */ + +Index: fontconfig-2.12.1/src/fcobjs.h +=================================================================== +--- fontconfig-2.12.1.orig/src/fcobjs.h ++++ fontconfig-2.12.1/src/fcobjs.h +@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) + FC_OBJECT (RGBA, FcTypeInteger, NULL) + FC_OBJECT (SCALE, FcTypeDouble, NULL) + FC_OBJECT (MINSPACE, FcTypeBool, NULL) +-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) ++FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) + FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) + FC_OBJECT (MATRIX, FcTypeMatrix, NULL) + FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) +Index: fontconfig-2.12.1/src/fcobjshash.gperf +=================================================================== +--- fontconfig-2.12.1.orig/src/fcobjshash.gperf ++++ fontconfig-2.12.1/src/fcobjshash.gperf +@@ -44,7 +44,7 @@ int id; + "rgba",FC_RGBA_OBJECT + "scale",FC_SCALE_OBJECT + "minspace",FC_MINSPACE_OBJECT +-"charwidth",FC_CHAR_WIDTH_OBJECT ++"charwidth",FC_CHARWIDTH_OBJECT + "charheight",FC_CHAR_HEIGHT_OBJECT + "matrix",FC_MATRIX_OBJECT + "charset",FC_CHARSET_OBJECT +Index: fontconfig-2.12.1/src/fcobjshash.h +=================================================================== +--- fontconfig-2.12.1.orig/src/fcobjshash.h ++++ fontconfig-2.12.1/src/fcobjshash.h +@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, + {-1}, + #line 47 "fcobjshash.gperf" +- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, ++ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, + #line 48 "fcobjshash.gperf" + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, + #line 55 "fcobjshash.gperf"