diff options
-rw-r--r-- | repo/devel/flex.xibuild | 2 | ||||
-rw-r--r-- | repo/devel/rustc.xibuild | 2 | ||||
-rw-r--r-- | repo/system/coreutils.xibuild | 2 | ||||
-rw-r--r-- | repo/system/gperf.xibuild | 2 | ||||
-rw-r--r-- | repo/system/libiconv.xibuild | 19 |
5 files changed, 4 insertions, 23 deletions
diff --git a/repo/devel/flex.xibuild b/repo/devel/flex.xibuild index c937c2f..7523f07 100644 --- a/repo/devel/flex.xibuild +++ b/repo/devel/flex.xibuild @@ -8,7 +8,7 @@ SOURCE=https://github.com/westes/flex/releases/download/v$PKG_VER/flex-$PKG_VER. DESC="a utility for generating programs that recognize patterns in text" build () { - ./configure --prefix=/usr --docdir=/usr/share/doc/flex --disable-static CFLAGS=-liconv + ./configure --prefix=/usr --docdir=/usr/share/doc/flex --disable-static make } diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index 97f6b3f..c6c6777 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -51,7 +51,7 @@ EOF } build () { - export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi -C link-arg=-liconv" && + export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi" && python3 ./x.py build --exclude src/tools/miri } diff --git a/repo/system/coreutils.xibuild b/repo/system/coreutils.xibuild index 10c6fe1..2c0826a 100644 --- a/repo/system/coreutils.xibuild +++ b/repo/system/coreutils.xibuild @@ -13,7 +13,7 @@ build () { FORCE_UNSAFE_CONFIGURE=1 ./configure \ --prefix=/usr \ --enable-no-install-program=kill,uptime - make -liconv + make } package () { diff --git a/repo/system/gperf.xibuild b/repo/system/gperf.xibuild index 9a1327d..07ff515 100644 --- a/repo/system/gperf.xibuild +++ b/repo/system/gperf.xibuild @@ -8,7 +8,7 @@ SOURCE=http://ftp.gnu.org/pub/gnu/gperf/gperf-$PKG_VER.tar.gz DESC="Perfect hash function generator" build () { - ./configure LDFLAGS="-liconv" --prefix=/usr --docdir=/usr/share/doc/gperf-$PKG_VER + ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-$PKG_VER make } diff --git a/repo/system/libiconv.xibuild b/repo/system/libiconv.xibuild deleted file mode 100644 index b22b6c6..0000000 --- a/repo/system/libiconv.xibuild +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -MAKEDEPS=(make ) -DEPS=(glibc) - -PKG_VER=1.16 -SOURCE=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$PKG_VER.tar.gz - -DESC="GNU charset conversion library" - -build () { - ./configure --prefix=/usr --disable-static && - make -} - -package () { - make prefix=/usr lib=lib DESTDIR=$PKG_DEST install -} - |