From 1eec97a68804d5cb55c1771a67858cc5cfefef4d Mon Sep 17 00:00:00 2001 From: Matt Jenkins Date: Sat, 20 Sep 2025 23:37:57 +0100 Subject: [PATCH] More packages --- devel/cloog/PKGCONF | 12 +++++-- devel/cloog/patches/01-makefile-am.patch | 17 +++++++++ lang/flex/PKGCONF | 7 ++-- libs/lopsub/PKGCONF | 4 +-- libs/lopsub/patches/01-fix-makefile.patch | 43 +++++++++++++++++++++++ libs/lopsub/patches/02-fix-version.patch | 26 ++++++++++++++ libs/osl/PKGCONF | 3 +- 7 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 devel/cloog/patches/01-makefile-am.patch create mode 100644 libs/lopsub/patches/01-fix-makefile.patch create mode 100644 libs/lopsub/patches/02-fix-version.patch diff --git a/devel/cloog/PKGCONF b/devel/cloog/PKGCONF index 8d455f1..7f7c063 100644 --- a/devel/cloog/PKGCONF +++ b/devel/cloog/PKGCONF @@ -5,11 +5,19 @@ URL=git://github.com/periscop/cloog@${PACKAGE}-${VERSION} CATEGORY=devel DEPENDS="devel/autoconf devel/automake libs/isl devel/libtool" + +hook_git_clone_post() { + cd "${SRCDIR}/${PACKAGE}-${VERSION}" + git rm -rf isl + git submodule init + git submodule update +} + configure() { echo "Configuring $PACKAGE" cd "${SRCDIR}/${PACKAGE}-${VERSION}" - ./autogen.sh - ./configure --with-isl=system + autoreconf -fiv + ./configure --with-isl=system --with-osl=bundled } build() { diff --git a/devel/cloog/patches/01-makefile-am.patch b/devel/cloog/patches/01-makefile-am.patch new file mode 100644 index 0000000..452b3c6 --- /dev/null +++ b/devel/cloog/patches/01-makefile-am.patch @@ -0,0 +1,17 @@ +--- cloog-0.21.1.orig/Makefile.am Sat Sep 20 23:06:28 2025 ++++ cloog-0.21.1/Makefile.am Sat Sep 20 23:16:41 2025 +@@ -36,10 +36,10 @@ + # * Written by Cedric Bastoul, Cedric.Bastoul@inria.fr * + # * * + # *****************************************************************************/ +-if BUNDLED_ISL +- MAYBE_ISL = isl +- ISL_LA = $(top_builddir)/isl/libisl.la +-endif ++#if BUNDLED_ISL ++# MAYBE_ISL = isl ++# ISL_LA = $(top_builddir)/isl/libisl.la ++#endif + + if BUNDLED_OSL + MAYBE_OSL = osl diff --git a/lang/flex/PKGCONF b/lang/flex/PKGCONF index a2e3c8f..6192f4e 100644 --- a/lang/flex/PKGCONF +++ b/lang/flex/PKGCONF @@ -1,15 +1,14 @@ VERSION=2.6.4 PACKAGE=flex SRC=${PACKAGE}-${VERSION}.tar.gz -URL=git://github.com/westes/${PACKAGE}@v${VERSION} -CATEGORY=devel +URL=ftp://ftp.majenko.co.uk/mirrors/github.com/westes/flex/${SRC} +CATEGORY=lang DEPENDS="devel/automake devel/autoconf devel/libtool libs/gettext" configure() { echo "Configuring $PACKAGE" cd "${SRCDIR}/${PACKAGE}-${VERSION}" - ./autogen.sh - ./configure + ./configure } build() { diff --git a/libs/lopsub/PKGCONF b/libs/lopsub/PKGCONF index 882ccf6..c55b897 100644 --- a/libs/lopsub/PKGCONF +++ b/libs/lopsub/PKGCONF @@ -12,11 +12,11 @@ configure() { build() { echo "Building $PACKAGE" cd "${SRCDIR}/${PACKAGE}-${VERSION}" - make -j ${NCPU} + make -j ${NCPU} LEX=flex VERSION=${VERSION} } install() { echo "Installing $PACKAGE to ${DESTDIR}" cd "${SRCDIR}/${PACKAGE}-${VERSION}" - make install PREFIX="${DESTDIR}" + make install DESTDIR="${DESTDIR}" LEX=flex VERSION=${VERSION} } diff --git a/libs/lopsub/patches/01-fix-makefile.patch b/libs/lopsub/patches/01-fix-makefile.patch new file mode 100644 index 0000000..58e5053 --- /dev/null +++ b/libs/lopsub/patches/01-fix-makefile.patch @@ -0,0 +1,43 @@ +--- lopsub-1.0.5-2.orig/Makefile Sat Sep 20 22:44:11 2025 ++++ lopsub-1.0.5-2/Makefile Sat Sep 20 22:42:28 2025 +@@ -1,7 +1,6 @@ + # Implicit rules are implemented in make as suffix rules. The following rule + # empties the suffix list to disable the predefined implicit rules. This + # increases performance and avoids hard-to-debug behaviour. +-.SUFFIXES: + MAKEFLAGS += -Rr + ifeq ("$(origin CC)", "default") + CC := cc +@@ -28,7 +27,6 @@ + GZIP := gzip -fn9 + ZCAT := zcat + +-CC += -ffile-prefix-map=$(CURDIR)=. + + dummy != $(M4) /dev/null || printf 'failed' + ifeq ($(dummy), failed) +@@ -88,7 +86,7 @@ + %.lsg.h: %.suite lopsubgen + ./lopsubgen --gen-header < $< + %.1.gz: %.suite lopsubgen +- ./lopsubgen --gen-man=${@:.gz=} --version-string $(GIT_VERSION) < $< ++ ./lopsubgen --gen-man=${@:.gz=} --version-string $(VERSION) < $< + $(GZIP) ${@:.gz=} + + # compiling +@@ -137,9 +135,12 @@ + $(ZCAT) $< | $(GROFF) -m man -Thtml | sed -e '1,/^/d' >> $@ + + install: $(all) +- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(PREFIX)/include \ +- $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man5 \ +- $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/bin ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/include ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man1 ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man5 ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man7 ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -m 644 $(REALNAME) $(DESTDIR)$(PREFIX)/lib + $(LN) -s $(REALNAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME) + $(LN) -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(LINKERNAME) diff --git a/libs/lopsub/patches/02-fix-version.patch b/libs/lopsub/patches/02-fix-version.patch new file mode 100644 index 0000000..63f0839 --- /dev/null +++ b/libs/lopsub/patches/02-fix-version.patch @@ -0,0 +1,26 @@ +--- lopsub-1.0.5-2.orig/version-gen.sh Sat Sep 20 22:28:49 2025 ++++ lopsub-1.0.5-2/version-gen.sh Sat Sep 20 22:31:41 2025 +@@ -1,22 +1,7 @@ + #!/bin/sh + + version_file='version.c' +-ver='unnamed_version' +-# First try git, then gitweb, then default. +-if [ -e '.git' -o -e '../.git' ]; then +- git_ver=$(git describe --abbrev=4 HEAD 2>/dev/null) +- [ -z "$git_ver" ] && git_ver="$ver" +- # update stat information in index to match working tree +- git update-index -q --refresh > /dev/null +- # if there are differences (exit code 1), the working tree is dirty +- git diff-index --quiet HEAD || git_ver=$git_ver-dirty +- ver=$git_ver +-elif [ -f debian/changelog ]; then +- ver="$(sed -ne '1s/.*(\(.*\)-.*/\1/1; tx; d; :x; p' debian/changelog)" +-elif [ "${PWD%%-*}" = 'lopsub-' ]; then +- ver=${PWD##*/lopsub-} +-fi +-ver=${ver#v} ++ver=${VERSION} + + echo "$ver" + diff --git a/libs/osl/PKGCONF b/libs/osl/PKGCONF index 5fb1f82..baab8e7 100644 --- a/libs/osl/PKGCONF +++ b/libs/osl/PKGCONF @@ -6,6 +6,7 @@ CATEGORY=libs DEPENDS="devel/m4 libs/lopsub" configure() { + echo "Nothing to configure" } build() { @@ -17,5 +18,5 @@ build() { install() { echo "Installing $PACKAGE to ${DESTDIR}" cd "${SRCDIR}/${PACKAGE}-${VERSION}" - make install PREFIX="${DESTDIR}" + make install PREFIX="${DESTDIR}/usr/local" }