From e179c8bab629eb4f1ceb840ef6eed33c4d4c553b Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 24 Apr 2019 01:28:36 +0000 Subject: system/libucontext: build static library --- system/libucontext/APKBUILD | 6 ++-- system/libucontext/static.patch | 76 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 system/libucontext/static.patch diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index 05950ae27..30d179102 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libucontext pkgver=0.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="ucontext function implementations" url="https://git.dereferenced.org/kaniini/libucontext/" arch="all" @@ -10,6 +10,7 @@ depends="" subpackages="$pkgname-dev" source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz powerpc.patch + static.patch " case "$CTARGET_ARCH" in @@ -35,4 +36,5 @@ package() { } sha512sums="9e0694c09f159de714b655f6a4201a05c8d1871ee7376bb6bf824206b45475cfbd8269ca1caa75b9c322624d9f77d3fc3f938228a4bdd267a5ddceb57ca5c1ab libucontext-0.1.3.tar.xz -22627fc66e57f64c24a8fb0d6e64fda8abfc4f72cc7a9b3d4f06cdb2b406adacd3d1b7eaa0321133959557ed4ee6856bdf5aee764f3b90981ec5b41cc1e5cd91 powerpc.patch" +22627fc66e57f64c24a8fb0d6e64fda8abfc4f72cc7a9b3d4f06cdb2b406adacd3d1b7eaa0321133959557ed4ee6856bdf5aee764f3b90981ec5b41cc1e5cd91 powerpc.patch +d63cf70c5226508f76dd1483a607e6e54417e062b7b77f3e70c7be244aff9cb81d19458b7f208bdf70c550aaa4da728eb91d9c280c461f64e6836c9d409f9aeb static.patch" diff --git a/system/libucontext/static.patch b/system/libucontext/static.patch new file mode 100644 index 000000000..a51e55f64 --- /dev/null +++ b/system/libucontext/static.patch @@ -0,0 +1,76 @@ +From 9cc1a2c0e62c75dc7afd20d5e337953f44693b70 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20Iva=C8=99cu?= +Date: Tue, 9 Apr 2019 16:07:39 +0300 +Subject: [PATCH] Build static library too + +--- + Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d6ff1b0..d81153c 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,10 +8,14 @@ LIBUCONTEXT_S_SRC = $(wildcard arch/${ARCH}/*.S) + LIBUCONTEXT_OBJ = ${LIBUCONTEXT_C_SRC:.c=.o} ${LIBUCONTEXT_S_SRC:.S=.o} + LIBUCONTEXT_SOVERSION = 0 + LIBUCONTEXT_NAME = libucontext.so ++LIBUCONTEXT_STATIC_NAME = libucontext.a + LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} + LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} + +-all: ${LIBUCONTEXT_SONAME} ++all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} ++ ++${LIBUCONTEXT_STATIC_NAME}: ${LIBUCONTEXT_OBJ} ++ $(AR) rcs ${LIBUCONTEXT_STATIC_NAME} ${LIBUCONTEXT_OBJ} + + ${LIBUCONTEXT_NAME}: ${LIBUCONTEXT_OBJ} + $(CC) -o ${LIBUCONTEXT_NAME} -Wl,-soname,${LIBUCONTEXT_SONAME} \ +From 2e15b383272fafbbb92882990b8f339e2c6888d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20Iva=C8=99cu?= +Date: Fri, 12 Apr 2019 10:48:24 +0300 +Subject: [PATCH] Makefile: Handle static library at clean/install + +--- + .gitignore | 1 + + Makefile | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/.gitignore b/.gitignore +index 4fb95ca..d2e350f 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -34,5 +34,6 @@ Makefile.in + + *.o + test_libucontext ++libucontext.a + libucontext.so + libucontext.so.* +diff --git a/Makefile b/Makefile +index d81153c..8a605fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,6 +11,7 @@ LIBUCONTEXT_NAME = libucontext.so + LIBUCONTEXT_STATIC_NAME = libucontext.a + LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} + LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} ++LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} + + all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} + +@@ -31,10 +32,12 @@ ${LIBUCONTEXT_SONAME}: ${LIBUCONTEXT_NAME} + $(CC) -fPIC -DPIC ${CFLAGS} ${CPPFLAGS} -c -o $@ $< + + clean: +- rm -f ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_OBJ} test_libucontext ++ rm -f ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} \ ++ ${LIBUCONTEXT_OBJ} test_libucontext + + 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}/lib/${LIBUCONTEXT_NAME} + + check: test_libucontext ${LIBUCONTEXT_SONAME} -- cgit v1.2.3-70-g09d2