diff options
| author | Ismael Luceno | 2019-05-17 01:44:27 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2019-05-17 21:35:20 +0200 |
| commit | 8b5d645bfce7755c116e2f13559fdb01fa858c0f (patch) | |
| tree | 56a5f1a24ce481cbe9ca092d5c907c9908d8ada7 /database | |
| parent | 748cc837a64bc1c2faad36b01b802f527ffffea6 (diff) | |
db: Replace musl patch with sed expr
Diffstat (limited to 'database')
| -rw-r--r-- | database/db/HISTORY | 3 | ||||
| -rwxr-xr-x | database/db/PRE_BUILD | 2 | ||||
| -rw-r--r-- | database/db/db-5.3.28-musl-detect.patch | 10 |
3 files changed, 4 insertions, 11 deletions
diff --git a/database/db/HISTORY b/database/db/HISTORY index f81de232ea..313cefe28e 100644 --- a/database/db/HISTORY +++ b/database/db/HISTORY @@ -1,3 +1,6 @@ +2019-05-17 Ismael Luceno <ismael@sourcemage.org> + * PRE_BUILD, db-5.3.28-musl-detect.patch: Replaced patch w/sed expr. + 2019-05-14 Ismael Luceno <ismael@sourcemage.org> * PRE_BUILD, db-5.3.28-musl-detect.patch: Fixed build against musl diff --git a/database/db/PRE_BUILD b/database/db/PRE_BUILD index 5608e63b5c..5528e7138d 100755 --- a/database/db/PRE_BUILD +++ b/database/db/PRE_BUILD @@ -7,6 +7,6 @@ patch -p1 < "${SPELL_DIRECTORY}"/javafix.diff && message "${MESSAGE_COLOR}Applying GCC 8.x Clang fix...${DEFAULT_COLOR}" && patch -p1 < "${SPELL_DIRECTORY}"/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch && -patch -fp1 -i "$SPELL_DIRECTORY"/db-5.3.28-musl-detect.patch && +sedit 's!maybe_os in$!& linux-musl*|\\!' dist/config.sub && sedit 's|\(docdir\w*=\w*[^/]*\)/docs|\1/share/doc/db|' dist/Makefile.in diff --git a/database/db/db-5.3.28-musl-detect.patch b/database/db/db-5.3.28-musl-detect.patch deleted file mode 100644 index 72809bbfba..0000000000 --- a/database/db/db-5.3.28-musl-detect.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- db-5.3.28/dist/config.sub.orig 2019-05-14 01:47:55.953219891 +0200 -+++ db-5.3.28/dist/config.sub 2019-05-14 01:48:35.713528717 +0200 -@@ -125,6 +125,7 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ |