Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1d9598c2c1ffaac7d3e67a02aa24b3f01f4bc305)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1d9598c2c1ffaac7d3e67a02aa24b3f01f4bc305)
  • Date: Fri, 17 May 2019 19:38:53 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 4 +++
database/db/HISTORY | 3 ++
database/db/PRE_BUILD | 2 -
database/db/db-5.3.28-musl-detect.patch | 10 --------
devel/indent/HISTORY | 3 ++
devel/indent/PRE_BUILD | 1
devel/perl/BUILD | 5 +---
devel/perl/DEPENDS | 2 +
devel/perl/HISTORY | 7 ++++-
devel/perl/PRE_BUILD | 3 ++
doc/man/HISTORY | 3 ++
doc/man/PRE_BUILD | 1
doc/man/missing-includes.patch | 14 +++++++++++
libs/gettext-tiny/BUILD | 6 ++++
libs/gettext-tiny/CONFLICTS | 1
libs/gettext-tiny/DETAILS | 40
++++++++++++++++++++++++++++++++
libs/gettext-tiny/HISTORY | 2 +
libs/gettext-tiny/INSTALL | 1
libs/gettext-tiny/PROVIDES | 1
libs/gettext/HISTORY | 3 ++
libs/gettext/PROVIDES | 1
libs/icu/DEPENDS | 3 +-
libs/icu/HISTORY | 3 ++
libs/musl/BUILD | 17 ++++---------
libs/musl/HISTORY | 4 +++
net/libpcap/HISTORY | 3 ++
net/libpcap/PRE_BUILD | 3 ++
net/libpcap/missing-includes.patch | 14 +++++++++++
28 files changed, 132 insertions(+), 28 deletions(-)

New commits:
commit 1d9598c2c1ffaac7d3e67a02aa24b3f01f4bc305
Author: Ismael Luceno <ismael.luceno AT silicon-gears.com>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl: Fix GCC version check

Signed-off-by: Ismael Luceno <ismael.luceno AT silicon-gears.com>

commit 6e260fa80c5720133dfdb8c15320593933c7b9fb
Author: Ismael Luceno <ismael.luceno AT silicon-gears.com>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl: Use -Dusethreads instead of modifying LDFLAGS

Signed-off-by: Ismael Luceno <ismael.luceno AT silicon-gears.com>

commit 9106d26766c212b9be6a87827720177ef421f58c
Author: Ismael Luceno <ismael.luceno AT silicon-gears.com>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl: Depends on bzip2 and zlib

Signed-off-by: Ismael Luceno <ismael.luceno AT silicon-gears.com>

commit a2fd27e5a020e42de3650adb2a96939e8a374d06
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

musl: solo build

commit dbf21515448ff50acf95e5dada269b527e2b3312
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

musl: Install non-native to /opt/musl, native to /usr

commit 8b5d645bfce7755c116e2f13559fdb01fa858c0f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

db: Replace musl patch with sed expr

commit 748cc837a64bc1c2faad36b01b802f527ffffea6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libpcap: Fix build against musl

commit 64582a6629350ff178bfcbce94cb9358133728d3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

man: Fix build against musl

commit c9bb20c86b39225df334da32521574976529c232
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

icu: Fix dependencies, +PYTHON +GETTEXT

commit 76da3549aca2285d1262386652aa85a7847755f3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gettext-tiny: new spell, replacement for gettext

commit a301a9c7e8b65f01f4dff06c81ac827f58d0c0ae
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gettext: Provide GETTEXT

commit 921447fc6aeb3fcb2505248142b3ffb7e45a8c4c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

indent: Fix build against musl

diff --git a/ChangeLog b/ChangeLog
index 280277a..8fb2600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * libs/gettext-tiny: new spell, Lightweight replacement for the
+ GNU gettext suite
+
2019-05-14 Treeve Jelbert <treeve AT sourcemage.org>
* devel/kdiff3: deleted
* kde.gpg: add Michael Reeves <reeves.87 AT gmail.com>
diff --git a/database/db/HISTORY b/database/db/HISTORY
index f81de23..313cefe 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,6 @@
+2019-05-17 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, db-5.3.28-musl-detect.patch: Replaced patch w/sed expr.
+
2019-05-14 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, db-5.3.28-musl-detect.patch: Fixed build against musl

diff --git a/database/db/PRE_BUILD b/database/db/PRE_BUILD
index 5608e63..5528e71 100755
--- a/database/db/PRE_BUILD
+++ b/database/db/PRE_BUILD
@@ -7,6 +7,6 @@ patch -p1 < "${SPELL_DIRECTORY}"/javafix.diff &&
message "${MESSAGE_COLOR}Applying GCC 8.x Clang fix...${DEFAULT_COLOR}" &&
patch -p1 <
"${SPELL_DIRECTORY}"/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
&&

-patch -fp1 -i "$SPELL_DIRECTORY"/db-5.3.28-musl-detect.patch &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' dist/config.sub &&

sedit 's|\(docdir\w*=\w*[^/]*\)/docs|\1/share/doc/db|' dist/Makefile.in
diff --git a/database/db/db-5.3.28-musl-detect.patch
b/database/db/db-5.3.28-musl-detect.patch
deleted file mode 100644
index 72809bb..0000000
--- a/database/db/db-5.3.28-musl-detect.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- db-5.3.28/dist/config.sub.orig 2019-05-14 01:47:55.953219891 +0200
-+++ db-5.3.28/dist/config.sub 2019-05-14 01:48:35.713528717 +0200
-@@ -125,6 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* |
\
-+ linux-musl* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
diff --git a/devel/indent/HISTORY b/devel/indent/HISTORY
index 26e8d93..8fbdc1e 100644
--- a/devel/indent/HISTORY
+++ b/devel/indent/HISTORY
@@ -1,3 +1,6 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2014-01-22 Ismael Luceno <ismael AT sourcemage.org>
* gcc-4.0-indent.h.patch: removed, no longer needed
* DETAILS: updated spell to 2.2.10
diff --git a/devel/indent/PRE_BUILD b/devel/indent/PRE_BUILD
index 090e721..7d8f45e 100755
--- a/devel/indent/PRE_BUILD
+++ b/devel/indent/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config/config.sub &&
sed -i 's,docdir = $(prefix)/doc,docdir = $(prefix)/share/doc,'
doc/Makefile.*
diff --git a/devel/perl/BUILD b/devel/perl/BUILD
index eb7311b..2cb506b 100755
--- a/devel/perl/BUILD
+++ b/devel/perl/BUILD
@@ -20,9 +20,7 @@ PERL_PATHS="-Dprefix=/usr \

local CONFIG_OPTS="-Ui_db -Duseshrplib -Ulocincpth=" &&

-if glibc_is_nptl; then
- LDFLAGS="$LDFLAGS -lpthread"
-fi &&
+CONFIG_OPTS+=" -Dusethreads"

if [[ $OLD_CUSTOM == y ]]; then
CONFIG_OPTS="-S "
@@ -39,6 +37,7 @@ else
rm -f config.sh
fi &&

+BUILD_ZLIB=False BUILD_BZIP2=0 \
setarch ${HOST%%-*} ./Configure -Doptimize="$CFLAGS" $CONFIG_OPTS
$PERL_PATHS &&

make depend &&
diff --git a/devel/perl/DEPENDS b/devel/perl/DEPENDS
index c23fc18..d15193f 100755
--- a/devel/perl/DEPENDS
+++ b/devel/perl/DEPENDS
@@ -1 +1,3 @@
+depends zlib &&
+depends bzip2 &&
optional_depends gdbm "" "" "for database support"
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index 47de62f..761b74f 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,4 +1,9 @@
-2019-04-20 Florian Franzmann < siflfran AT hawo.stw.uni-erlangen.de>
+2019-05-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, BUILD: added dependencies on zlib and bzip2
+ * BUILD: Added -Dusethreads
+ * PRE_BUILD: Fixed gcc version check
+
+2019-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.28.2

2018-12-03 Pavel Vinogradov <public AT sourcemage.org>
diff --git a/devel/perl/PRE_BUILD b/devel/perl/PRE_BUILD
new file mode 100755
index 0000000..4090b47
--- /dev/null
+++ b/devel/perl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's@gccversion" in@& [1-3][!.]*|[4-9]*|\\@' Configure
diff --git a/doc/man/HISTORY b/doc/man/HISTORY
index 5c1eb85..6ef4cde 100644
--- a/doc/man/HISTORY
+++ b/doc/man/HISTORY
@@ -1,3 +1,6 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, missing-includes.patch: Fixed build against musl
+
2018-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PROVIDES: provide MAN

diff --git a/doc/man/PRE_BUILD b/doc/man/PRE_BUILD
index 16c5448..3009454 100755
--- a/doc/man/PRE_BUILD
+++ b/doc/man/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -fp1 -i "$SPELL_DIRECTORY/missing-includes.patch" &&
patch -p0 < "$SPELL_DIRECTORY/man.conf.patch"
diff --git a/doc/man/missing-includes.patch b/doc/man/missing-includes.patch
new file mode 100644
index 0000000..afa2a1a
--- /dev/null
+++ b/doc/man/missing-includes.patch
@@ -0,0 +1,14 @@
+Missing includes; required at least for compiling against musl.
+
+diff --git a/gencat/gencat.c.orig b/gencat/gencat.c
+index d1a7c31..99be7fa 100644
+--- a/gencat/gencat.c.orig
++++ b/gencat/gencat.c
+@@ -55,6 +55,7 @@ up-to-date. Many thanks.
+ #endif
+ #include <sys/file.h>
+ #include <sys/stat.h>
++#include <fcntl.h>
+ #include "gencat.h"
+
+ #ifndef L_SET
diff --git a/libs/gettext-tiny/BUILD b/libs/gettext-tiny/BUILD
new file mode 100755
index 0000000..8b64698
--- /dev/null
+++ b/libs/gettext-tiny/BUILD
@@ -0,0 +1,6 @@
+libintl=
+case "$HOST" in
+*-musl) libintl=MUSL;;
+*-gnu) libintl=NONE;;
+esac
+make LIBINTL="$libintl" CFLAGS="$CFLAGS" CC="$CC"
diff --git a/libs/gettext-tiny/CONFLICTS b/libs/gettext-tiny/CONFLICTS
new file mode 100755
index 0000000..7caaab1
--- /dev/null
+++ b/libs/gettext-tiny/CONFLICTS
@@ -0,0 +1 @@
+conflicts gettext
diff --git a/libs/gettext-tiny/DETAILS b/libs/gettext-tiny/DETAILS
new file mode 100755
index 0000000..eef85a4
--- /dev/null
+++ b/libs/gettext-tiny/DETAILS
@@ -0,0 +1,40 @@
+ SPELL=gettext-tiny
+ VERSION=0.3.1
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+ SOURCE_URL[0]=http://ftp.barfooze.de/pub/sabotage/tarballs/${SOURCE}
+
SOURCE_HASH=sha512:a2d88d3d0989a2f775d7940c28470f4cb80e41f190b69c65f61890764c73f96810006320e9daaf717e9fccd93eb541ca0c818bd58b2180713e030ad788263060
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://github.com/sabotage-linux/gettext-tiny";
+ LICENSE[0]="MIT"
+ ENTERED=20190417
+ KEYWORDS=""
+ SHORT="Lightweight replacement for the GNU gettext suite"
+cat << EOF
+gettext-tiny provides lightweight replacements for tools typically
+used from the GNU gettext suite, which is incredibly bloated and takes
+a lot of time to build (in the order of an hour on slow devices). the
+most notable component is msgfmt which is used to create binary
+translation files in the .mo format out of textual input files in .po
+format. this is the most important tool for building software from
+source, because it is used from the build processes of many software
+packages.
+
+our msgfmt implementation was initially a fake implementation that
+would just output the english input string as the translation, which
+is sufficient to get software to work, but it has since grown into a
+complete implementation. unlike the GNU implementation, it can even
+expand input strings containing so-called sysdep strings into a
+constant translation table. sysdep strings were glued as an
+after-thought onto the GNU implementation to deal with system-specific
+format strings, and in the GNU implementation those are created at
+runtime, which requires mapping the entire .mo file into read/write
+memory locations, thereby wasting precious RAM for read-only data that
+could otherwise be shared among processes.
+
+other parts of gettext-tiny such as xgettext and msgmerge are still
+stubs, but they are sufficient to build many packages.
+
+since musl libc, our preferred target, didn't provide a libintl in the
+past, (and it's also part of GNU gettext) we also ship a no-op libintl
+providing a header and a library.
+EOF
diff --git a/libs/gettext-tiny/HISTORY b/libs/gettext-tiny/HISTORY
new file mode 100644
index 0000000..2b1ba11
--- /dev/null
+++ b/libs/gettext-tiny/HISTORY
@@ -0,0 +1,2 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFLICTS, DETAILS, INSTALL, PROVIDES: spell created
diff --git a/libs/gettext-tiny/INSTALL b/libs/gettext-tiny/INSTALL
new file mode 100755
index 0000000..04bdeaa
--- /dev/null
+++ b/libs/gettext-tiny/INSTALL
@@ -0,0 +1 @@
+make prefix="$INSTALL_ROOT/usr" install
diff --git a/libs/gettext-tiny/PROVIDES b/libs/gettext-tiny/PROVIDES
new file mode 100755
index 0000000..1a48646
--- /dev/null
+++ b/libs/gettext-tiny/PROVIDES
@@ -0,0 +1 @@
+GETTEXT
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 33911f9..073c730 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,6 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PROVIDES: provides GETTEXT
+
2019-05-12 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.20.1

diff --git a/libs/gettext/PROVIDES b/libs/gettext/PROVIDES
new file mode 100755
index 0000000..1a48646
--- /dev/null
+++ b/libs/gettext/PROVIDES
@@ -0,0 +1 @@
+GETTEXT
diff --git a/libs/icu/DEPENDS b/libs/icu/DEPENDS
index cb04139..2fbfc32 100755
--- a/libs/icu/DEPENDS
+++ b/libs/icu/DEPENDS
@@ -1,2 +1,3 @@
depends -sub CXX gcc &&
-depends gettext
+depends GETTEXT &&
+depends PYTHON
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 5582ebf..1c67c47 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Fixed dependencies: +PYTHON +GETTEXT -gettext
+
2019-04-17 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 64.2

diff --git a/libs/musl/BUILD b/libs/musl/BUILD
index 0c276e6..e0fa167 100755
--- a/libs/musl/BUILD
+++ b/libs/musl/BUILD
@@ -1,13 +1,6 @@
CFLAGS="${CFLAGS//-ffast-math}"
- pfx="$INSTALL_ROOT"/usr
-conf="$INSTALL_ROOT"/etc
-slib="$INSTALL_ROOT"/lib
- lib="$pfx"/lib/musl
- inc="$pfx"/include/musl
-./configure \
- --prefix="$pfx" \
- --sysconfdir="$conf" \
- --syslibdir="$slib" \
- --libdir="$lib" \
- --includedir="$inc" \
- $OPTS
+case "$HOST" in
+*-musl) pfx="$INSTALL_ROOT/usr" ;;
+*) pfx="$INSTALL_ROOT/opt/musl" ;;
+esac
+./configure --prefix="$pfx" --syslibdir="$INSTALL_ROOT/lib" $OPTS
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index b468c2a..9414103 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,3 +1,7 @@
+2019-05-17 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed installation paths
+ * SOLO: build solo
+
2019-03-31 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.1.21

diff --git a/libs/musl/SOLO b/libs/musl/SOLO
new file mode 100755
index 0000000..e69de29
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 1f2750e..255bf89 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,6 @@
+2019-05-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, missing-includes.patch: Fixed build against musl
+
2018-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.0

diff --git a/net/libpcap/PRE_BUILD b/net/libpcap/PRE_BUILD
new file mode 100755
index 0000000..514701a
--- /dev/null
+++ b/net/libpcap/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -fp1 -i "$SPELL_DIRECTORY/missing-includes.patch"
diff --git a/net/libpcap/missing-includes.patch
b/net/libpcap/missing-includes.patch
new file mode 100644
index 0000000..02c2bc7
--- /dev/null
+++ b/net/libpcap/missing-includes.patch
@@ -0,0 +1,14 @@
+Missing includes; required at least for compiling against musl.
+
+diff --git a/pcap-usb-linux.c.orig b/pcap-usb-linux.c
+index 6f8adf6..a1aa576 100644
+--- a/pcap-usb-linux.c.orig
++++ b/pcap-usb-linux.c
+@@ -45,6 +45,7 @@
+ #include "strerror.h"
+ #endif
+
++#include <limits.h> /* NAME_MAX */
+ #include <ctype.h>
+ #include <errno.h>
+ #include <stdlib.h>



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1d9598c2c1ffaac7d3e67a02aa24b3f01f4bc305), Ismael Luceno, 05/17/2019

Archive powered by MHonArc 2.6.24.

Top of Page