diff options
author | Cem Keylan <cem@ckyln.com> | 2020-01-29 20:56:41 +0300 |
---|---|---|
committer | Cem Keylan <cem@ckyln.com> | 2020-01-29 20:56:41 +0300 |
commit | e6a7080ecc1c03569cf838cd5f0531709a051689 (patch) | |
tree | 3a57ba0d316f826e5492e86f21cf2cd7c28e4b13 /extra | |
parent | c4c3af9515953df86ab70b4b85ce2fdb3ccaca11 (diff) | |
download | repository-e6a7080ecc1c03569cf838cd5f0531709a051689.tar.gz |
revert
Diffstat (limited to 'extra')
-rwxr-xr-x | extra/glib/build | 3 | ||||
-rwxr-xr-x | extra/lvm2/build | 7 | ||||
-rwxr-xr-x | extra/rust/build | 3 | ||||
-rwxr-xr-x | extra/shared-mime-info/build | 3 | ||||
-rwxr-xr-x | extra/sqlite/build | 4 | ||||
-rwxr-xr-x | extra/webkit2gtk/build | 9 |
6 files changed, 9 insertions, 20 deletions
diff --git a/extra/glib/build b/extra/glib/build index 5d4b99da..60f19b1f 100755 --- a/extra/glib/build +++ b/extra/glib/build @@ -3,8 +3,7 @@ export DESTDIR="$1" # Remove 'libelf' dependency. -sed 's/if have_libelf/if not have_libelf/' gio/meson.build > gio/meson.build.bak -mv gio/meson.build.bak gio/meson.build +sed -i 's/if have_libelf/if not have_libelf/' gio/meson.build meson \ --prefix=/usr \ diff --git a/extra/lvm2/build b/extra/lvm2/build index c10f9cd0..ffa71785 100755 --- a/extra/lvm2/build +++ b/extra/lvm2/build @@ -7,11 +7,8 @@ patch -p1 < disable-symver.patch # Busybox doesn't provide this command, however # all it does is split words one per line and # 'tr' can be used in its place. -for file in make.tmpl.in libdm/make.tmpl.in ; do - sed 's/fmt -1/tr " " "\\n"/' $file > $file.bak - mv $file.bak $file -done - +sed -i 's/fmt -1/tr " " "\\n"/' \ + make.tmpl.in libdm/make.tmpl.in # The build fails when using busybox's 'mkdir'(?), # swap to using 'install -d' instead which works. diff --git a/extra/rust/build b/extra/rust/build index ea28f9ba..674d1700 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -17,8 +17,7 @@ patch -p1 < musl-libressl.patch # 'rust' checksums files in 'vendor/', but we patch a few files. for vendor in libc openssl-sys; do - sed 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json" > ".json.bak.$vendor" - mv ".json.bak.$vendor" "vendor/$vendor/.cargo-checksum.json" + sed -i 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json" done cat > config.toml <<EOF diff --git a/extra/shared-mime-info/build b/extra/shared-mime-info/build index 4a2c0ae7..58dddbe2 100755 --- a/extra/shared-mime-info/build +++ b/extra/shared-mime-info/build @@ -46,8 +46,7 @@ cat << EOF > config.h EOF # Fix config.h include. -sed 's/<config.h>/"config.h"/' update-mime-database.c > update-mime-database.c.bak -mv update-mime-database.c.bak update-mime-database.c +sed -i 's/<config.h>/"config.h"/' update-mime-database.c # shellcheck disable=2046 "${CC:-gcc}" -o "$1/usr/bin/update-mime-database" \ diff --git a/extra/sqlite/build b/extra/sqlite/build index 4f5b88ec..08c1fd23 100755 --- a/extra/sqlite/build +++ b/extra/sqlite/build @@ -2,9 +2,7 @@ export CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1" -sed 's/ -ltinfo//g' configure > configure.bak -mv configure.bak configure -chmod +x configure +sed -i 's/ -ltinfo//g' configure ./configure \ --prefix=/usr \ diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build index 68ce922e..05ba8c84 100755 --- a/extra/webkit2gtk/build +++ b/extra/webkit2gtk/build @@ -3,12 +3,9 @@ patch -p1 < fix-musl.patch # Remove gettext requirement. -sed 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c > .browser.c -mv .browser.c Tools/MiniBrowser/gtk/BrowserDownloadsBar.c -sed '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt > .cmake.bak -mv .cmake.bak Source/WebCore/platform/gtk/po/CMakeLists.txt -sed '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt > .cmake.bak -mv .cmake.bak Source/WebCore/platform/gtk/po/CMakeLists.txt +sed -i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c +sed -i '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt +sed -i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt export DESTDIR="$1" |