Mercurial > vanilla

changeset 147:605b4a7b264a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: general cleanup
author David Demelier <markand@malikania.fr>
date Mon, 11 Mar 2019 20:36:00 +0100
parents 5bda5dfeb875
children ceeee066b3b7
files core/acl/acl.sh core/attr/attr.sh core/bash/bash.sh core/coreutils/coreutils.sh core/diffutils/diffutils.sh core/file/file.sh core/findutils/findutils.sh core/gawk/gawk.sh core/grep/grep.sh core/gzip/gzip.sh core/kmod/kmod.sh core/less/less.sh core/sed/sed.sh core/shadow/shadow.sh core/tar/tar.sh core/texinfo/texinfo.sh core/util-linux/util-linux.sh core/xz/xz.sh dev/binutils/binutils.sh dev/gcc/gcc.sh dev/make/make.sh
diffstat 21 files changed, 59 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/core/acl/acl.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/acl/acl.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -31,8 +31,6 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}
 : ${NLS:=yes}
-: ${LDFLAGS:=}
-: ${LIBS:=}
 
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="core/gettext $PKGDEPENDS"
@@ -57,7 +55,7 @@
 		--prefix=/usr \
 		--disable-static \
 		--enable-shared \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/usr/lib/libacl.la
--- a/core/attr/attr.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/attr/attr.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -27,9 +27,9 @@
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-: ${NLS:=yes}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="core/gettext $PKGDEPENDS"
@@ -49,13 +49,13 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=CBUILD \
+		--host=CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-static \
 		--enable-shared \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/usr/lib/libattr.la
--- a/core/bash/bash.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/bash/bash.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -27,9 +27,9 @@
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-: ${NLS:=yes}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="core/gettext $PKGDEPENDS"
@@ -49,11 +49,11 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--without-bash-malloc \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/coreutils/coreutils.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/coreutils/coreutils.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -29,6 +29,9 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${GMP:=yes}
+: ${NLS:=yes}
+: ${SSL:=yes}
 
 if [ "$GMP" = "yes" ]; then
 	PKGDEPENDS="lib/gmp $PKGDEPENDS"
@@ -44,9 +47,9 @@
 fi
 if [ "$SSL" = "yes" ]; then
 	PKGDEPENDS="network/openssl $PKGDEPENDS"
-	with_ssl="--with-openssl=yes"
+	with_ssl="--with-openssl"
 else
-	with_ssl="--with-openssl=no"
+	with_ssl="--with-openssl"
 fi
 
 build()
@@ -63,13 +66,13 @@
 	LIBS="$LIBS" \
 	FORCE_UNSAFE_CONFIGURE=1 \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--enable-no-install-programs=kill,uptime \
-		${with_gmp} \
-		${with_nls} \
-		${with_ssl}
+		$with_gmp \
+		$with_nls \
+		$with_ssl
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/diffutils/diffutils.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/diffutils/diffutils.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -52,7 +52,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/file/file.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/file/file.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -41,8 +41,8 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--datadir=/usr/share/file
 	make
--- a/core/findutils/findutils.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/findutils/findutils.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -53,7 +53,7 @@
 		--host=$CHOST \
 		--prefix=/usr \
 		--without-selinux \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/gawk/gawk.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/gawk/gawk.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -48,10 +48,10 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/grep/grep.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/grep/grep.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -53,7 +53,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/gzip/gzip.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/gzip/gzip.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -40,8 +40,8 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/kmod/kmod.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/kmod/kmod.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -67,9 +67,9 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		${with_ssl} \
-		${with_xz} \
-		${with_zlib}
+		$with_ssl \
+		$with_xz \
+		$with_zlib
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/usr/lib/libkmod.la
--- a/core/less/less.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/less/less.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -41,8 +41,8 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-regex=pcre
--- a/core/sed/sed.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/sed/sed.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -59,8 +59,8 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		${with_acl} \
-		${with_nls}
+		$with_acl \
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/shadow/shadow.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/shadow/shadow.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -67,7 +67,7 @@
 		--enable-shared \
 		--without-pam \
 		--without-libpam \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/tar/tar.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/tar/tar.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -60,8 +60,8 @@
 		--host=$CHOST \
 		--prefix=/usr \
 		--without-selinux \
-		${with_acl} \
-		${with_nls}
+		$with_acl \
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/texinfo/texinfo.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/texinfo/texinfo.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -53,7 +53,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/usr/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
--- a/core/util-linux/util-linux.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/util-linux/util-linux.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -68,8 +68,8 @@
 		--prefix=/usr \
 		--sbindir=/usr/sbin \
 		--without-systemd \
-		${with_nls} \
-		${with_python}
+		$with_nls \
+		$with_python
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/usr/lib/lib{fdisk,smartcols,mount,blkid,uuid}.la
--- a/core/xz/xz.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/core/xz/xz.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -49,12 +49,12 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--disable-static \
 		--enable-shared \
-		${with_nls}
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/usr/lib/liblzma.la
--- a/dev/binutils/binutils.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/dev/binutils/binutils.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -32,6 +32,14 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${GDB:=yes}
+: ${NLS:=yes}
+
+if [ "$GDB" = "yes" ]; then
+	with_gdb="--enable-gdb"
+else
+	with_gdb="--disable-gdb"
+fi
 
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="core/gettext $PKGDEPENDS"
@@ -39,11 +47,6 @@
 else
 	with_nls="--disable-nls"
 fi
-if [ "$GDB" = "yes" ]; then
-	with_gdb="--enable-gdb"
-else
-	with_gdb="--disable-gdb"
-fi
 
 build()
 {
@@ -72,8 +75,8 @@
 		--enable-threads \
 		--with-pic \
 		--with-system-zlib \
-		${with_nls} \
-		${with_gdb}
+		$with_nls \
+		$with_gdb
 	make tooldir=/usr
 	make tooldir=/usr install DESTDIR=$DESTDIR
 
--- a/dev/gcc/gcc.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/dev/gcc/gcc.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -33,6 +33,7 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
+: ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="core/gettext $PKGDEPENDS"
--- a/dev/make/make.sh	Mon Mar 11 16:49:41 2019 +0100
+++ b/dev/make/make.sh	Mon Mar 11 20:36:00 2019 +0100
@@ -40,6 +40,7 @@
 else
 	with_guile="--without-guile"
 fi
+
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="core/gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
@@ -62,8 +63,8 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		${with_guile} \
-		${with_nls}
+		$with_guile \
+		$with_nls
 	make
 	make install DESTDIR=$DESTDIR