Skip to content

Commit bb12cbe

Browse files
committed
unix: use ROOT variable consistently
Fixing up some inconsistencies between scripts.
1 parent 91b32a0 commit bb12cbe

13 files changed

+26
-26
lines changed

cpython-unix/build-inputproto.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
pkg-config --version
1111

@@ -21,4 +21,4 @@ CFLAGS="-fPIC" ./configure \
2121
--prefix=/tools/deps
2222

2323
make -j `nproc`
24-
make -j `nproc` install DESTDIR=/build/out
24+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-kbproto.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
pkg-config --version
1111

@@ -21,4 +21,4 @@ CFLAGS="-fPIC" ./configure \
2121
--prefix=/tools/deps
2222

2323
make -j `nproc`
24-
make -j `nproc` install DESTDIR=/build/out
24+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-libX11.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
1111
export PKG_CONFIG_PATH=/tools/deps/share/pkgconfig:/tools/deps/lib/pkgconfig
@@ -48,4 +48,4 @@ CFLAGS="-fPIC -I/tools/deps/include" ./configure \
4848
${EXTRA_FLAGS}
4949

5050
make -j `nproc`
51-
make -j `nproc` install DESTDIR=/build/out
51+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-libXau.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
1111
export PKG_CONFIG_PATH=/tools/deps/share/pkgconfig:/tools/deps/lib/pkgconfig
@@ -24,4 +24,4 @@ CFLAGS="-fPIC" ./configure \
2424
${EXTRA_FLAGS}
2525

2626
make -j `nproc`
27-
make -j `nproc` install DESTDIR=/build/out
27+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-libpthread-stubs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
pkg-config --version
1111

@@ -21,4 +21,4 @@ CFLAGS="-fPIC" ./configure \
2121
--prefix=/tools/deps
2222

2323
make -j `nproc`
24-
make -j `nproc` install DESTDIR=/build/out
24+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-libressl.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
1111

@@ -21,4 +21,4 @@ CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" ./
2121
--disable-shared
2222

2323
make -j `nproc`
24-
make -j `nproc` install DESTDIR=/build/out
24+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-libxcb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
1111
export PKG_CONFIG_PATH=/tools/deps/share/pkgconfig:/tools/deps/lib/pkgconfig
@@ -24,4 +24,4 @@ CFLAGS="-fPIC" ./configure \
2424
${EXTRA_FLAGS}
2525

2626
make -j `nproc`
27-
make -j `nproc` install DESTDIR=/build/out
27+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-readline.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
1111

@@ -22,4 +22,4 @@ CLFAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LD
2222
--with-curses
2323

2424
make -j `nproc`
25-
make -j `nproc` install DESTDIR=/build/out
25+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-x11-util-macros.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
1111

@@ -17,4 +17,4 @@ pushd util-macros-${X11_UTIL_MACROS_VERSION}
1717
--prefix=/tools/deps
1818

1919
make -j `nproc`
20-
make -j `nproc` install DESTDIR=/build/out
20+
make -j `nproc` install DESTDIR=${ROOT}/out

cpython-unix/build-xcb-proto.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -ex
77

8-
cd /build
8+
ROOT=`pwd`
99

1010
pkg-config --version
1111

@@ -21,4 +21,4 @@ CFLAGS="-fPIC" ./configure \
2121
--prefix=/tools/deps
2222

2323
make -j `nproc`
24-
make -j `nproc` install DESTDIR=/build/out
24+
make -j `nproc` install DESTDIR=${ROOT}/out

0 commit comments

Comments
 (0)