Skip to Content.
Sympa Menu

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

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 (15846bb0d85ba00d2aa16eda0de41d2e336aa379)
  • Date: Mon, 6 May 2019 20:27:47 +0000

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

ChangeLog | 3 +
devel/bmake/HISTORY | 3 +
devel/bmake/PRE_BUILD | 3 +
devel/bmake/musl.patch | 35 ++++++++++++++++++++
haskell/haskell-aeson/DETAILS | 6 +--
haskell/haskell-aeson/HISTORY | 4 ++
libs/libuargp/BUILD | 1
libs/libuargp/DETAILS | 15 ++++++++
libs/libuargp/HISTORY | 2 +
libs/musl/BUILD | 1
libs/musl/DETAILS | 4 +-
libs/musl/HISTORY | 3 +
shell-term-fm/mingetty/BUILD | 2 -
shell-term-fm/mingetty/HISTORY | 3 +
utils/gpm/HISTORY | 3 +
utils/gpm/PRE_BUILD | 1
utils/gpm/gpm-1.20.7-musl.patch | 70
++++++++++++++++++++++++++++++++++++++++
windowmanagers/dvtm/BUILD | 2 -
windowmanagers/dvtm/HISTORY | 3 +
19 files changed, 157 insertions(+), 7 deletions(-)

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

bmake: Fix build against musl libc

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

mingetty: Pass CC to make

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

dvtm: override CC

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

gpm: Fix build against musl

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

libuargp: new spell, Hierarchical argument parsing library

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

musl 1.1.21

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

haskell-aeson 1.4.2.0

diff --git a/ChangeLog b/ChangeLog
index dcce9d1..63932fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-05-06 Ismael Luceno <ismael AT sourcemage.org>
+ * libs/libuargp: new spell, Hierarchical argument parsing library
+
2019-05-03 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/simplepush: new spell, Simplepush Python library

diff --git a/devel/bmake/HISTORY b/devel/bmake/HISTORY
index 8b1b9df..896598c 100644
--- a/devel/bmake/HISTORY
+++ b/devel/bmake/HISTORY
@@ -1,3 +1,6 @@
+2019-04-18 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, musl.patch: Fixed build against musl libc
+
2016-03-08 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 20160220

diff --git a/devel/bmake/PRE_BUILD b/devel/bmake/PRE_BUILD
new file mode 100755
index 0000000..fbf007c
--- /dev/null
+++ b/devel/bmake/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -fp1 -i "$SPELL_DIRECTORY"/musl.patch
diff --git a/devel/bmake/musl.patch b/devel/bmake/musl.patch
new file mode 100644
index 0000000..ad8a9a6
--- /dev/null
+++ b/devel/bmake/musl.patch
@@ -0,0 +1,35 @@
+--- a/suff.c
++++ b/suff.c
+@@ -67,5 +67,8 @@
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
++
++#define _BSD_SOURCE
++#include <strings.h> /* for ffs */
+
+ #ifndef MAKE_NATIVE
+--- a/targ.c
++++ b/targ.c
+@@ -67,5 +67,8 @@
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
++
++#define _BSD_SOURCE
++#include <strings.h> /* for ffs */
+
+ #ifndef MAKE_NATIVE
+--- a/unit-tests/dotwait.exp
++++ b/unit-tests/dotwait.exp
+@@ -22,10 +22,10 @@
+ shared.2.1
+ shared.2.99
+ shared.2.99
++cycle.1.99
+ make: Graph cycles through `cycle.2.99'
+ make: Graph cycles through `cycle.2.98'
+ make: Graph cycles through `cycle.2.97'
+-cycle.1.99
+ cycle.1.99
+ exit status 0
diff --git a/haskell/haskell-aeson/DETAILS b/haskell/haskell-aeson/DETAILS
index 545ab44..0208e4b 100755
--- a/haskell/haskell-aeson/DETAILS
+++ b/haskell/haskell-aeson/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-aeson
- VERSION=1.2.3.0
+ VERSION=1.4.2.0
SOURCE="aeson-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/aeson/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:756c230024010cacb5f8961ccbeda240e8fd04187cbb593605ee8709c6e8d6f20979d72e81fb05b5bcd5d36054a1c0b216c87bba8f2f4f914e80ff39a5a74659
+
SOURCE_URL[0]=https://hackage.haskell.org/package/aeson-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:b413a0f3c35e7598b297a622f744de4133d7f784893bfa274356c156f74aeeb37cc2344c7f2adf13d4c41403d07708f37bb93bfbc78edb9ea74dc297fadb15b7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/aeson-${VERSION}"
WEB_SITE="https://github.com/bos/aeson";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-aeson/HISTORY b/haskell/haskell-aeson/HISTORY
index 8d5fb57..b3e849b 100644
--- a/haskell/haskell-aeson/HISTORY
+++ b/haskell/haskell-aeson/HISTORY
@@ -1,3 +1,7 @@
+2019-02-09 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.2.0
+ Fixed SOURCE_URL[0]
+
2018-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix dependencies

diff --git a/libs/libuargp/BUILD b/libs/libuargp/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/libs/libuargp/BUILD
@@ -0,0 +1 @@
+make
diff --git a/libs/libuargp/DETAILS b/libs/libuargp/DETAILS
new file mode 100755
index 0000000..78da412
--- /dev/null
+++ b/libs/libuargp/DETAILS
@@ -0,0 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=libuargp
+ VERSION=$(get_scm_version)
+ SOURCE="$SPELL-git.tar.bz2"
+ SOURCE_URL[0]=git://github.com/xhebox/$SPELL.git
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SOURCE%.tar.bz2}"
+ WEB_SITE="https://github.com/xhebox/libuargp";
+ LICENSE[0]="LGPLv2.1"
+ ENTERED=20190408
+ KEYWORDS=""
+ SHORT="Hierarchical argument parsing library"
+cat << EOF
+This library provides a stand-alone implementation of glibc's argp for use
with other libc implementations.
+EOF
diff --git a/libs/libuargp/HISTORY b/libs/libuargp/HISTORY
new file mode 100644
index 0000000..5dc139c
--- /dev/null
+++ b/libs/libuargp/HISTORY
@@ -0,0 +1,2 @@
+2019-04-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: spell created
diff --git a/libs/musl/BUILD b/libs/musl/BUILD
index 0d16a70..0c276e6 100755
--- a/libs/musl/BUILD
+++ b/libs/musl/BUILD
@@ -1,3 +1,4 @@
+CFLAGS="${CFLAGS//-ffast-math}"
pfx="$INSTALL_ROOT"/usr
conf="$INSTALL_ROOT"/etc
slib="$INSTALL_ROOT"/lib
diff --git a/libs/musl/DETAILS b/libs/musl/DETAILS
index 1d2fcb8..afd7f01 100755
--- a/libs/musl/DETAILS
+++ b/libs/musl/DETAILS
@@ -1,9 +1,9 @@
SPELL=musl
- VERSION=1.1.12
+ VERSION=1.1.21
SOURCE="$SPELL-$VERSION.tar.gz"
WEB_SITE="http://www.musl-libc.org";
SOURCE_URL[0]="$WEB_SITE/releases/${SOURCE}"
-
SOURCE_HASH=sha512:7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70
+
SOURCE_HASH=sha512:fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]="MIT"
ENTERED=20150110
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index 07f4636..b468c2a 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,3 +1,6 @@
+2019-03-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.21
+
2015-11-06 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.1.12

diff --git a/shell-term-fm/mingetty/BUILD b/shell-term-fm/mingetty/BUILD
index 8f58e6d..fe4fe35 100755
--- a/shell-term-fm/mingetty/BUILD
+++ b/shell-term-fm/mingetty/BUILD
@@ -1 +1 @@
-make
+make CC="$CC"
diff --git a/shell-term-fm/mingetty/HISTORY b/shell-term-fm/mingetty/HISTORY
index 3f993aa..dd2281f 100644
--- a/shell-term-fm/mingetty/HISTORY
+++ b/shell-term-fm/mingetty/HISTORY
@@ -1,3 +1,6 @@
+2019-04-17 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: pass CC to make
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index 92adeca..5144c7e 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,6 @@
+2018-04-08 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, gpm-1.20.7-musl.patch: Added patch to build against musl
libc
+
2018-03-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.20.7
* PRE_BUILD: generate configure script
diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD
index 0677d20..4fec01a 100755
--- a/utils/gpm/PRE_BUILD
+++ b/utils/gpm/PRE_BUILD
@@ -3,5 +3,6 @@ cd "$SOURCE_DIRECTORY" &&

patch -p1 < "$SPELL_DIRECTORY/gpm-1.20.7-glibc-2.26.patch" &&
patch -p1 < "$SPELL_DIRECTORY/gpm-1.20.7-sysmacros.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/gpm-1.20.7-musl.patch" &&

./autogen.sh
diff --git a/utils/gpm/gpm-1.20.7-musl.patch b/utils/gpm/gpm-1.20.7-musl.patch
new file mode 100644
index 0000000..ce0e37a
--- /dev/null
+++ b/utils/gpm/gpm-1.20.7-musl.patch
@@ -0,0 +1,70 @@
+From eb0e14f8a5c414603b2e882df54b9fec138104ec Mon Sep 17 00:00:00 2001
+From: Dima Krasner <dima AT dimakrasner.com>
+Date: Wed, 12 Nov 2014 23:06:46 +0200
+Subject: [PATCH] Added musl support to libgpm and the daemon.
+
+[Upstream patch backported from the github repository,
+https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.]
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni AT free-electrons.com>
+---
+ src/daemon/open_console.c | 1 +
+ src/prog/display-buttons.c | 1 +
+ src/prog/display-coords.c | 1 +
+ src/prog/gpm-root.y | 4 ++--
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
+index 98297c9..4d6c0af 100644
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -21,6 +21,7 @@
+
+ #include <fcntl.h> /* open and co. */
+ #include <sys/stat.h> /* stat() */
++#include <sys/types.h> /* major() */
+ #include <sys/ioctl.h> /* ioctl */
+
+ /* Linux specific (to be outsourced in gpm2 */
+diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c
+index de8e5b2..38d2f11 100644
+--- a/src/prog/display-buttons.c
++++ b/src/prog/display-buttons.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h> /* printf() */
+ #include <time.h> /* time() */
+ #include <errno.h> /* errno */
++#include <sys/select.h> /* fd_set and FD_* */
+ #include <gpm.h> /* gpm information */
+
+ /* display resulting data */
+diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c
+index ed15c8a..411283a 100644
+--- a/src/prog/display-coords.c
++++ b/src/prog/display-coords.c
+@@ -37,6 +37,7 @@
+ #include <stdio.h> /* printf() */
+ #include <time.h> /* time() */
+ #include <errno.h> /* errno */
++#include <sys/select.h> /* fd_set and FD_* */
+ #include <gpm.h> /* gpm information */
+
+ /* display resulting data */
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 069d801..188ae35 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1199,9 +1199,9 @@ int main(int argc, char **argv)
+ #if defined(__GLIBC__)
+ __sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+- childaction.sa_mask=0;
++ sigemptyset(&childaction.sa_mask);
+ #endif /* __GLIBC__ */
+- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
++ childaction.sa_flags=0;
+ sigaction(SIGCHLD,&childaction,NULL);
+
+ /*....................................... Connect and get your buffer */
+--
+2.1.0
diff --git a/windowmanagers/dvtm/BUILD b/windowmanagers/dvtm/BUILD
index 8f58e6d..fe4fe35 100755
--- a/windowmanagers/dvtm/BUILD
+++ b/windowmanagers/dvtm/BUILD
@@ -1 +1 @@
-make
+make CC="$CC"
diff --git a/windowmanagers/dvtm/HISTORY b/windowmanagers/dvtm/HISTORY
index 631b531..141fb50 100644
--- a/windowmanagers/dvtm/HISTORY
+++ b/windowmanagers/dvtm/HISTORY
@@ -1,3 +1,6 @@
+2019-04-16 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: override CC
+
2015-01-13 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.13




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

Archive powered by MHonArc 2.6.24.

Top of Page