From e91258801d55df6fcafbbaa14ea997359bb26dad Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Tue, 13 Jul 2021 17:11:35 -0400 Subject: [PATCH] m4, flex: replace with obsd implementations --- extra/flex/build | 20 ++++++++++++-------- extra/flex/checksums | 1 - extra/flex/depends | 1 - extra/flex/sources | 2 +- extra/flex/version | 2 +- extra/m4/build | 14 ++++++++------ extra/m4/checksums | 1 - extra/m4/sources | 2 +- extra/m4/version | 2 +- 9 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 extra/flex/depends diff --git a/extra/flex/build b/extra/flex/build index 2a1bda0..22732ed 100755 --- a/extra/flex/build +++ b/extra/flex/build @@ -1,11 +1,15 @@ -#!/bin/sh -e +#!/usr/bin/sh -e -./configure \ - --prefix=/usr \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes +for i in libopenbsd libz yacc mv lex; do + make PREFIX=/usr -C "$i" +done -make -make DESTDIR="$1" install +cd lex +install -Dm644 FlexLexer.h "$1/usr/include/FlexLexer.h" +install -Dm755 lex "$1/usr/bin/flex" +install -Dm644 flex.1 "$1/usr/share/man/man1/flex.1" + +ln -s /usr/bin/flex "$1/usr/bin/lex" +ln -s /usr/bin/flex "$1/usr/bin/flex++" +ln -s /usr/share/man/man1/flex "$1/usr/share/man/man1/lex" -ln -s flex "$1/usr/bin/lex" diff --git a/extra/flex/checksums b/extra/flex/checksums index 5f05df5..e69de29 100644 --- a/extra/flex/checksums +++ b/extra/flex/checksums @@ -1 +0,0 @@ -e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz diff --git a/extra/flex/depends b/extra/flex/depends deleted file mode 100644 index e8fb4a1..0000000 --- a/extra/flex/depends +++ /dev/null @@ -1 +0,0 @@ -m4 make diff --git a/extra/flex/sources b/extra/flex/sources index c10fca7..9475b43 100644 --- a/extra/flex/sources +++ b/extra/flex/sources @@ -1 +1 @@ -https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz +git+https://github.com/ibara/baseutils \ No newline at end of file diff --git a/extra/flex/version b/extra/flex/version index c689264..a383ea1 100644 --- a/extra/flex/version +++ b/extra/flex/version @@ -1 +1 @@ -2.6.4 1 +git 1 diff --git a/extra/m4/build b/extra/m4/build index 206a476..c88088c 100755 --- a/extra/m4/build +++ b/extra/m4/build @@ -1,9 +1,11 @@ -#!/bin/sh -e +#!/usr/bin/sh -e -export CFLAGS="$CFLAGS -static" +for i in libopenbsd libz yacc mv m4; do + make PREFIX=/usr -C "$i" +done -./configure \ - --prefix=/usr +mkdir -p "$1/usr/share/man" "$1/usr/bin" -make -make DESTDIR="$1" install +cd m4 +install -Dm755 m4 "$1/usr/bin/m4" +install -Dm644 m4.1 "$1/usr/share/man/man1/m4.1" diff --git a/extra/m4/checksums b/extra/m4/checksums index e413a19..e69de29 100644 --- a/extra/m4/checksums +++ b/extra/m4/checksums @@ -1 +0,0 @@ -63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 diff --git a/extra/m4/sources b/extra/m4/sources index bde2eff..9475b43 100644 --- a/extra/m4/sources +++ b/extra/m4/sources @@ -1 +1 @@ -https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz +git+https://github.com/ibara/baseutils \ No newline at end of file diff --git a/extra/m4/version b/extra/m4/version index b97669c..a383ea1 100644 --- a/extra/m4/version +++ b/extra/m4/version @@ -1 +1 @@ -1.4.19 1 +git 1 -- 2.39.2