| 1 |
commit: 9f4db0bd1b34cdcc532d0d2a76972100b55cbbec |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 14 16:10:59 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 16 14:29:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9f4db0bd |
| 7 |
|
| 8 |
e2fsprogs: Honor toolchain |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
gkbuilds/e2fsprogs.gkbuild | 10 ++- |
| 13 |
.../e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch | 83 ++++++++++++++++++++++ |
| 14 |
2 files changed, 92 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/gkbuilds/e2fsprogs.gkbuild b/gkbuilds/e2fsprogs.gkbuild |
| 17 |
index 78c7193..7cebcca 100644 |
| 18 |
--- a/gkbuilds/e2fsprogs.gkbuild |
| 19 |
+++ b/gkbuilds/e2fsprogs.gkbuild |
| 20 |
@@ -1,6 +1,10 @@ |
| 21 |
-# Copyright 1999-2019 Gentoo Authors |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
+# e2fsprogs-1.45.6-build.patch would trigger gkautoreconf |
| 26 |
+# which we cannot run because of gettext-0.20 incompatibility |
| 27 |
+WANT_AUTORECONF=no |
| 28 |
+ |
| 29 |
src_configure() { |
| 30 |
append-ldflags -static |
| 31 |
|
| 32 |
@@ -20,6 +24,10 @@ src_configure() { |
| 33 |
--disable-defrag |
| 34 |
) |
| 35 |
|
| 36 |
+ ac_cv_path_LDCONFIG=: \ |
| 37 |
+ CC="$(tc-getCC)" \ |
| 38 |
+ BUILD_CC="$(tc-getBUILD_CC)" \ |
| 39 |
+ BUILD_LD="$(tc-getBUILD_LD)" \ |
| 40 |
gkconf "${myconf[@]}" |
| 41 |
} |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch b/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch |
| 45 |
new file mode 100644 |
| 46 |
index 0000000..63e37f5 |
| 47 |
--- /dev/null |
| 48 |
+++ b/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch |
| 49 |
@@ -0,0 +1,83 @@ |
| 50 |
+--- a/MCONFIG.in |
| 51 |
++++ b/MCONFIG.in |
| 52 |
+@@ -86,6 +86,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l |
| 53 |
+ |
| 54 |
+ CC = @CC@ |
| 55 |
+ BUILD_CC = @BUILD_CC@ |
| 56 |
++BUILD_CFLAGS = @BUILD_CFLAGS@ |
| 57 |
+ CFLAGS = @CFLAGS@ |
| 58 |
+ CFLAGS_SHLIB = @CFLAGS_SHLIB@ |
| 59 |
+ CFLAGS_STLIB = @CFLAGS_STLIB@ |
| 60 |
+--- a/configure |
| 61 |
++++ b/configure |
| 62 |
+@@ -12398,14 +12398,12 @@ $as_echo "$as_me: WARNING: |
| 63 |
+ esac |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
+- |
| 67 |
+-# See if we need a separate native compiler. |
| 68 |
+-if test $cross_compiling = no; then |
| 69 |
+- BUILD_CC="$CC" |
| 70 |
+- |
| 71 |
+-else |
| 72 |
+- for ac_prog in gcc cc |
| 73 |
+-do |
| 74 |
++if test "${BUILD_CC+set}" != "set"; then |
| 75 |
++ if test $cross_compiling = no; then |
| 76 |
++ BUILD_CC="$CC" |
| 77 |
++ else |
| 78 |
++ for ac_prog in gcc cc |
| 79 |
++ do |
| 80 |
+ # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 81 |
+ set dummy $ac_prog; ac_word=$2 |
| 82 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 83 |
+@@ -12446,6 +12444,16 @@ fi |
| 84 |
+ test -n "$BUILD_CC" && break |
| 85 |
+ done |
| 86 |
+ |
| 87 |
++ fi |
| 88 |
++fi |
| 89 |
++ |
| 90 |
++if test "${BUILD_CFLAGS+set}" != "set"; then |
| 91 |
++ if test $cross_compiling = no; then |
| 92 |
++ BUILD_CFLAGS="$CFLAGS" |
| 93 |
++ else |
| 94 |
++ BUILD_CFLAGS="-g -O2" |
| 95 |
++ fi |
| 96 |
++ |
| 97 |
+ fi |
| 98 |
+ for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysctl.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
| 99 |
+ do : |
| 100 |
+--- a/configure.ac |
| 101 |
++++ b/configure.ac |
| 102 |
+@@ -910,13 +910,24 @@ else |
| 103 |
+ fi |
| 104 |
+ AC_SUBST(MAKEINFO) |
| 105 |
+ AC_PROG_INSTALL |
| 106 |
+-# See if we need a separate native compiler. |
| 107 |
+-if test $cross_compiling = no; then |
| 108 |
+- BUILD_CC="$CC" |
| 109 |
+- AC_SUBST(BUILD_CC) |
| 110 |
+-else |
| 111 |
+- AC_CHECK_PROGS(BUILD_CC, gcc cc) |
| 112 |
++ |
| 113 |
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools]) |
| 114 |
++if test "${BUILD_CC+set}" != "set"; then |
| 115 |
++ if test $cross_compiling = no; then |
| 116 |
++ BUILD_CC="$CC" |
| 117 |
++ else |
| 118 |
++ AC_CHECK_PROGS(BUILD_CC, gcc cc) |
| 119 |
++ fi |
| 120 |
++fi |
| 121 |
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools]) |
| 122 |
++if test "${BUILD_CFLAGS+set}" != "set"; then |
| 123 |
++ if test $cross_compiling = no; then |
| 124 |
++ BUILD_CFLAGS="$CFLAGS" |
| 125 |
++ else |
| 126 |
++ BUILD_CFLAGS="-g -O2" |
| 127 |
++ fi |
| 128 |
+ fi |
| 129 |
++ |
| 130 |
+ AC_CHECK_HEADERS(m4_flatten([ |
| 131 |
+ dirent.h |
| 132 |
+ errno.h |
Archives