Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (f9785ffc87858f08a98615fcbc7a29da1180e215)

Chronological Thread  
    < 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 (f9785ffc87858f08a98615fcbc7a29da1180e215)
  • Date: Tue, 28 May 2019 22:05:57 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

cluster/netpipe/BUILD | 9 ++-------
cluster/netpipe/DEPENDS | 4 ++--
cluster/netpipe/HISTORY | 4 ++++
cluster/netpipe/INSTALL | 16 ++++------------
editors/jed/HISTORY | 3 +++
editors/jed/PROVIDES | 1 +
editors/zile/HISTORY | 3 +++
editors/zile/PROVIDES | 3 +--
libs/musl/BUILD | 12 +++++++++---
libs/musl/DETAILS | 4 ++--
libs/musl/HISTORY | 8 ++++++++
libs/musl/INSTALL | 11 +++++++++++
libs/musl/PRE_BUILD | 3 +++
libs/readline/FINAL | 5 ++++-
libs/readline/HISTORY | 3 +++
smgl/basesystem/DEPENDS | 10 ++++++++--
smgl/basesystem/HISTORY | 3 +++
17 files changed, 71 insertions(+), 31 deletions(-)

New commits:
commit f9785ffc87858f08a98615fcbc7a29da1180e215
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

musl: Override broken install tool

Musl comes with a bundled install.sh that is used unconditionally; the
tool causes sorcery to fail to track the header files installation.

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

musl: Remove dep on $HOST for the INSTALL stage

The INSTALL stage can't depend on the HOST variable because this is
guessed by sorcery based on the installed ldd, which is going to be
removed before INSTALL.

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

musl: Make sure headers get installed

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

musl: Add a more robust installation method

Installing the library directly as the dynamic loader and make libc.so a
symlink to it.

Also install ldd (symlink to ld.so).

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

musl: Add missing call to make in BUILD

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

musl 1.1.22

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

readline: do not run ldconfig on non-glibc systems

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

netpipe: Simplify build and installation

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

zile: Does not provide VI

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

jed: Provides TEXT-EDITOR

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

basesystem: Add musl support

diff --git a/cluster/netpipe/BUILD b/cluster/netpipe/BUILD
index 8256aee..fb8b8ef 100755
--- a/cluster/netpipe/BUILD
+++ b/cluster/netpipe/BUILD
@@ -1,9 +1,4 @@
-make tcp &&
+OPTS+=" tcp"

-if spell_ok mpich; then
- make mpi
-fi &&

-if spell_ok pvm; then
- make pvm
-fi
+make CC="$CC" CFLAGS="$CFLAGS" $OPTS
diff --git a/cluster/netpipe/DEPENDS b/cluster/netpipe/DEPENDS
index d31575d..354c658 100755
--- a/cluster/netpipe/DEPENDS
+++ b/cluster/netpipe/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends mpich &&
-optional_depends pvm
+optional_depends mpich mpi '' &&
+optional_depends pvm pvm ''
diff --git a/cluster/netpipe/HISTORY b/cluster/netpipe/HISTORY
index 58d3f5c..b27db49 100644
--- a/cluster/netpipe/HISTORY
+++ b/cluster/netpipe/HISTORY
@@ -1,3 +1,7 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, INSTALL: Simplify build and installation
+ Install all the documentation
+
2015-01-08 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 3.7.2

diff --git a/cluster/netpipe/INSTALL b/cluster/netpipe/INSTALL
index a9c989b..5c30c68 100755
--- a/cluster/netpipe/INSTALL
+++ b/cluster/netpipe/INSTALL
@@ -1,12 +1,4 @@
-install -m 755 NPtcp ${INSTALL_ROOT}/usr/bin &&
-mkdir -p ${INSTALL_ROOT}/usr/share/doc/$SPELL/ &&
-install -m 0644 dox/netpipe_paper.ps \
- ${INSTALL_ROOT}/usr/share/doc/$SPELL/netpipe_paper.ps &&
-
-if spell_ok mpich; then
- install -m 755 NPmpi ${INSTALL_ROOT}/usr/bin
-fi &&
-
-if spell_ok pvm; then
- install -m 755 NPpvm ${INSTALL_ROOT}/usr/bin
-fi
+install -v -m755 -D -t "$INSTALL_ROOT/usr/bin" NP*
+install -v -m644 -D -t "$INSTALL_ROOT/usr/share/man/man1" dox/*.1
+install -v -m644 -D -t "$INSTALL_ROOT/usr/share/doc/$SPELL-$VERSION" \
+ dox/*.pdf dox/*.ps dox/README
diff --git a/editors/jed/HISTORY b/editors/jed/HISTORY
index a83dd4f..7d6d0a1 100644
--- a/editors/jed/HISTORY
+++ b/editors/jed/HISTORY
@@ -1,3 +1,6 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * PROVIDES: Added TEXT-EDITOR
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Fix build against musl

diff --git a/editors/jed/PROVIDES b/editors/jed/PROVIDES
new file mode 100755
index 0000000..8182706
--- /dev/null
+++ b/editors/jed/PROVIDES
@@ -0,0 +1 @@
+TEXT-EDITOR
diff --git a/editors/zile/HISTORY b/editors/zile/HISTORY
index e0f45e2..d9dbd4a 100644
--- a/editors/zile/HISTORY
+++ b/editors/zile/HISTORY
@@ -1,3 +1,6 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * PROVIDES: Removed VI
+
2016-01-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.4.11
* DEPENDS: doesn't depend on texlive anymore
diff --git a/editors/zile/PROVIDES b/editors/zile/PROVIDES
index 786f41f..8182706 100755
--- a/editors/zile/PROVIDES
+++ b/editors/zile/PROVIDES
@@ -1,2 +1 @@
-VI
-TEXT-EDITOR
\ No newline at end of file
+TEXT-EDITOR
diff --git a/libs/musl/BUILD b/libs/musl/BUILD
index e0fa167..74df7cd 100755
--- a/libs/musl/BUILD
+++ b/libs/musl/BUILD
@@ -1,6 +1,12 @@
CFLAGS="${CFLAGS//-ffast-math}"
case "$HOST" in
-*-musl) pfx="$INSTALL_ROOT/usr" ;;
-*) pfx="$INSTALL_ROOT/opt/musl" ;;
+*-musl)
+ touch .native &&
+ pfx="$INSTALL_ROOT/usr"
+ ;;
+*)
+ pfx="$INSTALL_ROOT/opt/musl"
+ ;;
esac
-./configure --prefix="$pfx" --syslibdir="$INSTALL_ROOT/lib" $OPTS
+./configure --prefix="$pfx" --syslibdir="$INSTALL_ROOT/lib" $OPTS &&
+make
diff --git a/libs/musl/DETAILS b/libs/musl/DETAILS
index afd7f01..dd0ac45 100755
--- a/libs/musl/DETAILS
+++ b/libs/musl/DETAILS
@@ -1,9 +1,9 @@
SPELL=musl
- VERSION=1.1.21
+ VERSION=1.1.22
SOURCE="$SPELL-$VERSION.tar.gz"
WEB_SITE="http://www.musl-libc.org";
SOURCE_URL[0]="$WEB_SITE/releases/${SOURCE}"
-
SOURCE_HASH=sha512:fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
+
SOURCE_HASH=sha512:08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]="MIT"
ENTERED=20150110
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index 9414103..0617ea1 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,3 +1,11 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.22
+ * BUILD: Added missing call to make
+ * INSTALL: Added a more robust installation method
+ * PRE_BUILD: Added safety guard to make sure headers get installed
+ * BUILD, INSTALL: Removed dependency on $HOST for the INSTALL stage
+ * INSTALL: Overriden the INSTALL make variable, broken bundled tool
+
2019-05-17 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: fixed installation paths
* SOLO: build solo
diff --git a/libs/musl/INSTALL b/libs/musl/INSTALL
new file mode 100755
index 0000000..1037ada
--- /dev/null
+++ b/libs/musl/INSTALL
@@ -0,0 +1,11 @@
+inst_opt=(INSTALL=install)
+if [ -f .native ]; then
+ bindir="$INSTALL_ROOT/usr/bin" &&
+ libdir="$INSTALL_ROOT/usr/lib" &&
+ ldso=ld-musl-x86_64.so.1 &&
+ install -v -D -m755 lib/libc.so "$INSTALL_ROOT/lib/$ldso" &&
+ ln -vsnf "../../lib/$ldso" "$bindir/ldd" &&
+ ln -vsnf "../../lib/$ldso" "$libdir/libc.so" &&
+ inst_opt+=(SHARED_LIBS=)
+fi &&
+make "${inst_opt[@]}" install
diff --git a/libs/musl/PRE_BUILD b/libs/musl/PRE_BUILD
new file mode 100755
index 0000000..2278a51
--- /dev/null
+++ b/libs/musl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+# Make sure the headers get installed
+find "$SOURCE_DIRECTORY/include" -name '*.h' -exec touch {} +
diff --git a/libs/readline/FINAL b/libs/readline/FINAL
index 32d09d8..60b622b 100755
--- a/libs/readline/FINAL
+++ b/libs/readline/FINAL
@@ -1 +1,4 @@
-ldconfig
+case "$HOST" in *-gnu)
+ ldconfig
+ ;;
+esac
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 39599ca..582e10b 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,6 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * FINAL: don't run ldconfig on non-glibc systems
+
2019-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_INSTALL: added, to protect special libraries
* DETAILS: re-enable staging
diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index d84c274..b1ad52a 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -7,9 +7,15 @@ depends dialog &&
depends diffutils &&
depends file &&
depends findutils &&
-depends AWK &&
+depends AWK &&
depends gcc &&
-depends glibc &&
+case "$HOST" in
+*-musl)
+ depends musl &&
+ depends libuargp ;;
+*)
+ depends glibc ;;
+esac &&
depends GNUPG &&
depends grep &&
depends gzip &&
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 19ccbbb..8fbfb98 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,6 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Added musl support
+
2019-05-11 Remko van der Vossen <wich AT sourcemage.org>
* CONFLICTS: removed, only deinstall gnupg when installing an
alternative



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

Archive powered by MHonArc 2.6.24.

Top of Page