build / midipix_build

Clone
Source Code
GIT

3c2739 Revert "subr/pkg_{build,install_make}.subr: default to LIBTOOL=rdlibtool (via midipix.)"

Authored and Committed by Lucio Andrés Illanes Albornoz 5 years ago
raw patch tree parent
4 files changed. 13 lines added. 13 lines removed.
subr/pkg_build.subr
file modified
+1 -1
subr/pkg_install_make.subr
file modified
+1 -1
vars/gcc.vars
file modified
+5 -5
vars/midipix.vars
file modified
+6 -6 
    Revert "subr/pkg_{build,install_make}.subr: default to LIBTOOL=rdlibtool (via midipix.)"
    
    This reverts commit fde9ee5a1385d14a8bd82ae548f1d7c1e1de551a.
file modified
+1 -1
subr/pkg_build.subr CHANGED
@@ -22,7 +22,7 @@ pkg_build() {
22
22
"${PKG_PKGCONFIG:+PKGCONFIG=${PKG_PKGCONFIG}}" \
23
23
"${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \
24
24
"${PKG_PKG_CONFIG_LIBPATH:+PKG_CONFIG_LIBPATH=${PKG_PKG_CONFIG_LIBPATH}}"\
25
- "LIBTOOL=${PKG_LIBTOOL:-rdlibtool}";
25
+ "LIBTOOL=${PKG_LIBTOOL:-slibtool}";
26
26
};
27
27
28
28
# vim:filetype=sh
file modified
+1 -1
subr/pkg_install_make.subr CHANGED
@@ -12,7 +12,7 @@ pkg_install_make() {
12
12
"${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \
13
13
"${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \
14
14
"${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \
15
- "LIBTOOL=${PKG_LIBTOOL:-rdlibtool}" \
15
+ "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \
16
16
"${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \
17
17
${PKG_INSTALL_TARGET:=install};
18
18
};
file modified
+5 -5
vars/gcc.vars CHANGED
@@ -10,7 +10,7 @@ pkgp_gcc_build_dir() {
10
10
11
11
pkgp_gcc_setup_env() {
12
12
local __="";
13
- export MAKE="make LIBTOOL=rdlibtool";
13
+ export MAKE="make LIBTOOL=slibtool";
14
14
export cbb_target="${PKG_TARGET}";
15
15
unwind_midipix_h=$(readlink -f "${PKG_BASE_DIR}/cbb-gcc-${1}/gcc/unwind-midipix.h");
16
16
case "${PKG_NAME}" in
@@ -196,7 +196,7 @@ pkg_gcc_stage1_all() {
196
196
pkg_gcc_runtime_host_all() {
197
197
local _restart_at="${1}";
198
198
local _vis_hide="vis_hide=-fvisibility=hidden";
199
- export MAKE="make LIBTOOL=rdlibtool ${_vis_hide}";
199
+ export MAKE="make LIBTOOL=slibtool ${_vis_hide}";
200
200
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
201
201
ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
202
202
# GCC, compiler runtime.
@@ -220,7 +220,7 @@ pkg_gcc_runtime_host_all() {
220
220
221
221
pkg_gcc_libstdcpp_v3_host_all() {
222
222
local _restart_at="${1}";
223
- export MAKE="make LIBTOOL=rdlibtool";
223
+ export MAKE="make LIBTOOL=slibtool";
224
224
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
225
225
ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
226
226
# GCC, libstdc++-v3.
@@ -244,7 +244,7 @@ pkg_gcc_libstdcpp_v3_host_all() {
244
244
245
245
pkg_gcc_full_host_all() {
246
246
local _restart_at="${1}";
247
- export MAKE="make LIBTOOL=rdlibtool";
247
+ export MAKE="make LIBTOOL=slibtool";
248
248
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
249
249
ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
250
250
# GCC, everything else.
@@ -269,7 +269,7 @@ pkg_gcc_full_host_all() {
269
269
pkg_gcc_full_all() {
270
270
local _restart_at="${1}" _configure_host="";
271
271
local _vis_hide="vis_hide=-fvisibility=hidden";
272
- export MAKE="make LIBTOOL=rdlibtool ${_vis_hide}";
272
+ export MAKE="make LIBTOOL=slibtool ${_vis_hide}";
273
273
# GCC, native.
274
274
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
275
275
if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
file modified
+6 -6
vars/midipix.vars CHANGED
@@ -67,20 +67,20 @@
67
67
: ${DEFAULT_CROSS_AR:=${DEFAULT_TARGET}-ar};
68
68
: ${DEFAULT_CROSS_CC:=${DEFAULT_TARGET}-gcc};
69
69
: ${DEFAULT_CROSS_CXX:=${DEFAULT_TARGET}-g++};
70
- : ${DEFAULT_CROSS_LIBTOOL:=rdlibtool};
71
- : ${DEFAULT_CROSS_MAKE:=make LIBTOOL=rdlibtool};
70
+ : ${DEFAULT_CROSS_LIBTOOL:=slibtool};
71
+ : ${DEFAULT_CROSS_MAKE:=make LIBTOOL=slibtool};
72
72
: ${DEFAULT_CROSS_RANLIB:=${DEFAULT_TARGET}-ranlib};
73
73
: ${DEFAULT_HOST_AR:=ar};
74
74
: ${DEFAULT_HOST_CC:=gcc};
75
75
: ${DEFAULT_HOST_CXX:=g++};
76
- : ${DEFAULT_HOST_LIBTOOL:=rdlibtool};
77
- : ${DEFAULT_HOST_MAKE:=make LIBTOOL=rdlibtool};
76
+ : ${DEFAULT_HOST_LIBTOOL:=slibtool};
77
+ : ${DEFAULT_HOST_MAKE:=make LIBTOOL=slibtool};
78
78
: ${DEFAULT_HOST_RANLIB:=ranlib};
79
79
: ${DEFAULT_NATIVE_AR:=${DEFAULT_TARGET}-ar};
80
80
: ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc};
81
81
: ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++};
82
- : ${DEFAULT_NATIVE_LIBTOOL:=rdlibtool};
83
- : ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=rdlibtool};
82
+ : ${DEFAULT_NATIVE_LIBTOOL:=slibtool};
83
+ : ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=slibtool};
84
84
: ${DEFAULT_NATIVE_PKGCONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
85
85
: ${DEFAULT_NATIVE_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
86
86
: ${DEFAULT_NATIVE_PKG_CONFIG_LIBDIR:=${PREFIX_NATIVE}/lib/pkgconfig};

Powered by Pagure 5.13.3

SSH Hostkey/Fingerprint | Documentation | About

© Red Hat, Inc. and others.