Skip to Content.
Sympa Menu

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

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 (5a89f7f1416ee2c6499cfcba62d36299b0dd5064)
  • Date: Sat, 10 Sep 2022 10:14:28 +0000

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

libs/libucontext/BUILD
| 4
libs/libucontext/DETAILS
| 4
libs/libucontext/HISTORY
| 6
libs/libucontext/INSTALL
| 1
libs/libucontext/PRE_BUILD
| 3

libs/libucontext/patches/0001-Makefile-Make-variables-Automake-compatible.patch
| 105 ++++++++++
6 files changed, 120 insertions(+), 3 deletions(-)

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

libucontext: Fix installation paths

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

libucontext 1.2

diff --git a/libs/libucontext/BUILD b/libs/libucontext/BUILD
index 8f58e6d..a7fb87a 100755
--- a/libs/libucontext/BUILD
+++ b/libs/libucontext/BUILD
@@ -1 +1,3 @@
-make
+OPTS+=" prefix=\"$INSTALL_ROOT\"/usr" &&
+OPTS+=" shared_libdir=\"$INSTALL_ROOT\"/lib" &&
+make $OPTS
diff --git a/libs/libucontext/DETAILS b/libs/libucontext/DETAILS
index ed073f5..837c78f 100755
--- a/libs/libucontext/DETAILS
+++ b/libs/libucontext/DETAILS
@@ -1,9 +1,9 @@
SPELL=libucontext
- VERSION=0.13.1
+ VERSION=1.2
SOURCE="$SPELL-$VERSION.tar.gz"
WEB_SITE="https://github.com/kaniini/libucontext";
SOURCE_URL[0]="$WEB_SITE/archive/$SOURCE"
-
SOURCE_HASH=sha512:fd00bbbd7610edd7a9382306e6d0cbe2ff0fca071fa2732c515ea4bee93f515bbe2724f64814f847ab90e9f26cb22c09dab71b612bcf67d4c0500d7ba92c90f5
+
SOURCE_HASH=sha512:f47b776517fa9e3fe48b762b11ae580c28bd7646f9e3ab843141d3e203f886326e68dd8040852ab1cb92dbd09d821161660c4be44e3025448d90131e74a4cf51
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$SPELL-$VERSION"
LICENSE[0]="MIT"
ENTERED=20190917
diff --git a/libs/libucontext/HISTORY b/libs/libucontext/HISTORY
index 8ac599e..18c7b85 100644
--- a/libs/libucontext/HISTORY
+++ b/libs/libucontext/HISTORY
@@ -1,3 +1,9 @@
+2022-09-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.2
+ * BUILD, INSTALL, PRE_BUILD,
+ patches/0001-Makefile-Make-variables-Automake-compatible.patch:
+ fixed installation paths
+
2020-12-10 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.13.1

diff --git a/libs/libucontext/INSTALL b/libs/libucontext/INSTALL
new file mode 100755
index 0000000..524e24e
--- /dev/null
+++ b/libs/libucontext/INSTALL
@@ -0,0 +1 @@
+make install $OPTS
diff --git a/libs/libucontext/PRE_BUILD b/libs/libucontext/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/libs/libucontext/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/libs/libucontext/patches/0001-Makefile-Make-variables-Automake-compatible.patch

b/libs/libucontext/patches/0001-Makefile-Make-variables-Automake-compatible.patch
new file mode 100644
index 0000000..d41a6d2
--- /dev/null
+++
b/libs/libucontext/patches/0001-Makefile-Make-variables-Automake-compatible.patch
@@ -0,0 +1,105 @@
+From e9b7ad256973c2b0fcc45ab7caba7bdb484a8854 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 9 Sep 2022 23:59:57 +0200
+Subject: [PATCH] Makefile: Make variables Automake-compatible
+
+Also split libdir into shared and static variants to enable installing to
+different locations.
+
+Patch-Status: Submitted [https://github.com/kaniini/libucontext/pull/48]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ Makefile | 29 +++++++++++++++++------------
+ libucontext.pc.in | 5 +++--
+ 2 files changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 405022bf8ccf..194ef0d25f25 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,9 +17,13 @@ ifeq ($(ARCH),$(filter $(ARCH),arm64))
+ override ARCH = aarch64
+ endif
+
+-LIBDIR := /lib
+-INCLUDEDIR := /usr/include
+-PKGCONFIGDIR := /usr/lib/pkgconfig
++prefix = /usr
++libdir = ${prefix}/lib
++shared_libdir = ${libdir}
++static_libdir = ${libdir}
++includedir = ${prefix}/include
++pkgconfigdir = ${prefix}/lib/pkgconfig
++
+ CFLAGS ?= -ggdb3 -O2 -Wall
+ CPPFLAGS := -Iinclude -Iarch/${ARCH} -Iarch/common
+ ifneq ($(shell uname),Darwin)
+@@ -79,8 +83,8 @@ else
+ endif
+ LIBUCONTEXT_STATIC_NAME = libucontext.a
+ LIBUCONTEXT_PC = libucontext.pc
+-LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME}
+-LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME}
++LIBUCONTEXT_PATH = ${shared_libdir}/${LIBUCONTEXT_SONAME}
++LIBUCONTEXT_STATIC_PATH = ${static_libdir}/${LIBUCONTEXT_STATIC_NAME}
+ LIBUCONTEXT_HEADERS = \
+ include/libucontext/libucontext.h \
+ include/libucontext/bits.h
+@@ -89,8 +93,8 @@ LIBUCONTEXT_EXAMPLES = \
+ LIBUCONTEXT_POSIX_STATIC_NAME = libucontext_posix.a
+ LIBUCONTEXT_POSIX_C_SRC = libucontext_posix.c
+ LIBUCONTEXT_POSIX_OBJ = ${LIBUCONTEXT_POSIX_C_SRC:.c=.o}
+-LIBUCONTEXT_POSIX_PATH = ${LIBDIR}/${LIBUCONTEXT_POSIX_SONAME}
+-LIBUCONTEXT_POSIX_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_POSIX_STATIC_NAME}
++LIBUCONTEXT_POSIX_PATH = ${shared_libdir}/${LIBUCONTEXT_POSIX_SONAME}
++LIBUCONTEXT_POSIX_STATIC_PATH =
${static_libdir}/${LIBUCONTEXT_POSIX_STATIC_NAME}
+
+ ifeq ($(FREESTANDING),yes)
+ LIBUCONTEXT_POSIX_NAME =
+@@ -119,8 +123,9 @@ ${LIBUCONTEXT_SONAME}: ${LIBUCONTEXT_NAME}
+
+ ${LIBUCONTEXT_PC}: libucontext.pc.in
+ sed -e s:@LIBUCONTEXT_VERSION@:${LIBUCONTEXT_VERSION}:g \
+- -e s:@LIBUCONTEXT_LIBDIR@:${LIBDIR}:g \
+- -e s:@LIBUCONTEXT_INCLUDEDIR@:${INCLUDEDIR}:g $< > $@
++ -e s:@LIBUCONTEXT_SHARED_LIBDIR@:${shared_libdir}:g \
++ -e s:@LIBUCONTEXT_STATIC_LIBDIR@:${static_libdir}:g \
++ -e s:@LIBUCONTEXT_INCLUDEDIR@:${includedir}:g $< > $@
+
+ MANPAGES_SYMLINKS_3 = \
+ libucontext_getcontext.3 \
+@@ -204,12 +209,12 @@ clean: docs_clean
+ install: all
+ install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH}
+ install -D -m664 ${LIBUCONTEXT_STATIC_NAME}
${DESTDIR}${LIBUCONTEXT_STATIC_PATH}
+- ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME}
++ ln -sf ${LIBUCONTEXT_SONAME}
${DESTDIR}${shared_libdir}/${LIBUCONTEXT_NAME}
+ for i in ${LIBUCONTEXT_HEADERS}; do \
+ destfn=$$(echo $$i | sed s:include/::g); \
+- install -D -m644 $$i ${DESTDIR}${INCLUDEDIR}/$$destfn; \
++ install -D -m644 $$i ${DESTDIR}${includedir}/$$destfn; \
+ done
+- install -D -m644 ${LIBUCONTEXT_PC}
${DESTDIR}${PKGCONFIGDIR}/${LIBUCONTEXT_PC}
++ install -D -m644 ${LIBUCONTEXT_PC}
${DESTDIR}${pkgconfigdir}/${LIBUCONTEXT_PC}
+ if [ -n ${LIBUCONTEXT_POSIX_NAME} ]; then \
+ install -D -m755 ${LIBUCONTEXT_POSIX_NAME}
${DESTDIR}${LIBUCONTEXT_POSIX_PATH}; \
+ install -D -m644 ${LIBUCONTEXT_POSIX_STATIC_NAME}
${DESTDIR}${LIBUCONTEXT_POSIX_STATIC_PATH}; \
+diff --git a/libucontext.pc.in b/libucontext.pc.in
+index 6288c7fbca13..10962d8590d5 100644
+--- a/libucontext.pc.in
++++ b/libucontext.pc.in
+@@ -1,8 +1,9 @@
+-libdir=@LIBUCONTEXT_LIBDIR@
++libdir=@LIBUCONTEXT_SHARED_LIBDIR@
++static_libdir=@LIBUCONTEXT_STATIC_LIBDIR@
+ includedir=@LIBUCONTEXT_INCLUDEDIR@
+
+ Name: libucontext
+ Version: @LIBUCONTEXT_VERSION@
+ Description: ucontext library implementation (standalone)
+-Libs: -L${libdir} -lucontext
++Libs: -L${libdir} -L${static_libdir} -lucontext
+ Cflags: -I${includedir}
+--
+2.37.3
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (5a89f7f1416ee2c6499cfcba62d36299b0dd5064), Ismael Luceno, 09/10/2022

Archive powered by MHonArc 2.6.24.

Top of Page