diff options
| -rwxr-xr-x | community/figlet/build | 2 | ||||
| -rwxr-xr-x | core/gcc/build | 4 | ||||
| -rwxr-xr-x | core/libelf/build | 2 | ||||
| -rwxr-xr-x | core/mandoc/build | 5 | ||||
| -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 | ||||
| -rwxr-xr-x | xorg/cairo/build | 5 | ||||
| -rwxr-xr-x | xorg/gtk+3/build | 10 | ||||
| -rwxr-xr-x | xorg/libxcb/build | 4 | ||||
| -rwxr-xr-x | xorg/mesa/build | 2 | ||||
| -rwxr-xr-x | xorg/st/build | 2 | ||||
| -rwxr-xr-x | xorg/xinit/build | 2 |
16 files changed, 25 insertions, 42 deletions
diff --git a/community/figlet/build b/community/figlet/build index 8c0b6604..f604eb35 100755 --- a/community/figlet/build +++ b/community/figlet/build @@ -1,5 +1,5 @@ #!/bin/sh -e -sed '/DECLS/d' utf8.h > utf8.h.bak && mv utf8.h.bak utf8.h +sed -i '/DECLS/d' utf8.h make prefix=/usr make prefix=/usr DESTDIR="$1" install diff --git a/core/gcc/build b/core/gcc/build index b0a09ddb..ef0e87db 100755 --- a/core/gcc/build +++ b/core/gcc/build @@ -5,8 +5,8 @@ cp -v gcc/gmp/configfsf.guess gcc/gmp/config.guess cp -v gcc/gmp/configfsf.sub gcc/gmp/config.sub # Use lib not lib64 by default. -sed '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64 > t-linux64.bak && mv t-linux64.bak gcc/gcc/config/i386/t-linux64 -sed 's/lib64/lib/' gcc/gcc/config/i386/linux64.h > linux64.h.bak && mv linux64.h.bak gcc/gcc/config/i386/linux64.h +sed -i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64 +sed -i 's/lib64/lib/' gcc/gcc/config/i386/linux64.h # Build must happen outside of gcc source. mkdir -p gcc-build diff --git a/core/libelf/build b/core/libelf/build index 01c1dab2..a7a7f497 100755 --- a/core/libelf/build +++ b/core/libelf/build @@ -1,6 +1,6 @@ #!/bin/sh -e -sed 's/-I/-isystem /g' libelf.pc.in > libelf.pc.in.bak && mv libelf.pc.in.bak libelf.pc.in +sed -i 's/-I/-isystem /g' libelf.pc.in ./configure \ --prefix=/usr \ diff --git a/core/mandoc/build b/core/mandoc/build index c04afc3c..11f1bfed 100755 --- a/core/mandoc/build +++ b/core/mandoc/build @@ -1,8 +1,7 @@ #!/bin/sh -e -sed 's,"more -s","less",g' main.c > main.c.bak && mv main.c.bak main.c -sed "s/CC=.*/CC='$CC'/" configure > configure.bak && mv configure.bak configure -chmod +x configure +sed -i 's,"more -s","less",g' main.c +sed -i "s/CC=.*/CC='$CC'/" configure cat > configure.local <<EOF PREFIX=/usr 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" diff --git a/xorg/cairo/build b/xorg/cairo/build index 518c4ca0..92dafa69 100755 --- a/xorg/cairo/build +++ b/xorg/cairo/build @@ -1,9 +1,8 @@ #!/bin/sh -e # Disable building 'cairo-sphinx'. -sed "s/BUILD_SPHINX_TRUE=/BUILD_SPHINX_TRUE='#'/" configure > configure.bak -sed "s/BUILD_SPHINX_FALSE='#'/BUILD_SPHINX_FALSE=/" configure.bak > configure -chmod +x configure +sed -i "s/BUILD_SPHINX_TRUE=/BUILD_SPHINX_TRUE='#'/" configure +sed -i "s/BUILD_SPHINX_FALSE='#'/BUILD_SPHINX_FALSE=/" configure ./configure \ --prefix=/usr \ diff --git a/xorg/gtk+3/build b/xorg/gtk+3/build index 7f49f150..9db3b285 100755 --- a/xorg/gtk+3/build +++ b/xorg/gtk+3/build @@ -1,13 +1,11 @@ #!/bin/sh -e # Remove 'atk-bridge' dependency which removes the 'dbus' dependency. -sed 's/ATK_PACKAGES="atk atk-bridge-2.0"/ATK_PACKAGES="atk"/' \ - configure > configure.bak && mv configure.bak configure -chmod +x configure +sed -i 's/ATK_PACKAGES="atk atk-bridge-2.0"/ATK_PACKAGES="atk"/' \ + configure -sed '/<atk-bridge.h>/d;/atk_bridge_adaptor_init/d' \ - gtk/a11y/gtkaccessibility.c > sed.bak -mv sed.bak gtk/ally/gtkaccessibility.c +sed -i '/<atk-bridge.h>/d;/atk_bridge_adaptor_init/d' \ + gtk/a11y/gtkaccessibility.c ./configure \ --prefix=/usr \ diff --git a/xorg/libxcb/build b/xorg/libxcb/build index cbf38ed8..285ad906 100755 --- a/xorg/libxcb/build +++ b/xorg/libxcb/build @@ -1,8 +1,6 @@ #!/bin/sh -e -sed 's/pthread-stubs //' configure > configure.bak -mv configure.bak configure -chmod +x configure +sed -i 's/pthread-stubs //' configure ./configure \ --prefix=/usr diff --git a/xorg/mesa/build b/xorg/mesa/build index e2cecdcf..9a7f79bd 100755 --- a/xorg/mesa/build +++ b/xorg/mesa/build @@ -6,7 +6,7 @@ export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS" # Fix issues with musl and firefox. # https://bugs.freedesktop.org/show_bug.cgi?id=35268 # https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2 -sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build > meson.build.bak && mv meson.build.bak meson.build +sed -i "/pre_args += '-DUSE_ELF_TLS'/d" meson.build meson \ --prefix=/usr \ diff --git a/xorg/st/build b/xorg/st/build index 343b2ed8..53074cc3 100755 --- a/xorg/st/build +++ b/xorg/st/build @@ -1,6 +1,6 @@ #!/bin/sh -e -sed 's|Liberation Mono|Monospace|g' config.def.h > config.h +sed -i 's|Liberation Mono|Monospace|g' config.def.h make make PREFIX=/usr DESTDIR="$1" install diff --git a/xorg/xinit/build b/xorg/xinit/build index 6931a024..311b9d59 100755 --- a/xorg/xinit/build +++ b/xorg/xinit/build @@ -7,4 +7,4 @@ make make DESTDIR="$1" install -sed 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx" > startx.bak && mv startx.bak "$1/usr/bin/startx" +sed -i 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx" |