840cbd
Fixed libressl installation issue (reported by noninc.)
|
@@ -42,7 +42,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
|
|
|
42
42
|
: ${WORKDIR:=${PREFIX}/tmp};
|
|
43
43
|
|
|
44
44
|
bash binutils binutils_host bzip2 coreutils dalist dash diffutils findutils gawk git gmp grep gzip less libelf libressl libz make mpc mpfr ncurses ntapi ntcon ntctty openssh patch pemagine popt psxscl psxstub psxtypes rsync sed tar util_linux which xz"};
|
|
45
|
-
AR_CONFIGURE BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL_MIDIPIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_TYPE VERSION"};
|
|
45
|
+
AR_CONFIGURE BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_TYPE VERSION"};
|
|
46
46
|
: ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
|
|
47
47
|
--host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
|
|
48
48
|
: ${PKG_LVL0_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}};
|
|
@@ -154,10 +154,11 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
|
|
|
154
154
|
: ${PKG_LIBFFI_LIBTOOL_MIDIPIX:=1};
|
|
155
155
|
: ${PKG_LIBRESSL_VERSION:=2.2.6};
|
|
156
156
|
: ${PKG_LIBRESSL_SHA256SUM:=1ee19994cffd047d40f63ba149115dba18a681b0cc923beec301bf424b58d64f};
|
|
157
|
-
: ${PKG_LIBRESSL_URL:=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz};
|
|
157
|
+
: ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz};
|
|
158
158
|
: ${PKG_LIBRESSL_CFLAGS_CONFIGURE_EXTRA:=-D__MIDIPIX};
|
|
159
159
|
: ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm};
|
|
160
160
|
: ${PKG_LIBRESSL_LIBTOOL_MIDIPIX:=1};
|
|
161
|
+
: ${PKG_LIBRESSL_LIBTOOL_MIDIPIX_FIX:=1};
|
|
161
162
|
: ${PKG_LIBZ_VERSION:=1.2.8.2015.05.20};
|
|
162
163
|
: ${PKG_LIBZ_SHA256SUM:=33e65f22ec3d3e3f87436e53f82eb114054cd3aa373dc0480625dd92806fd9a0};
|
|
163
164
|
: ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
|
|
@@ -46,6 +46,11 @@ if ! is_build_script_done patch; then
|
|
|
46
46
|
cp portage/libtool.midipix ${PKG_SUBDIR}/;
|
|
47
47
|
sed -i.orig -e "/^libdir=/s/libdir='/libdir='\$PKG_PREFIX\//"\
|
|
48
48
|
${PKG_SUBDIR}/libtool.midipix;
|
|
49
|
+
if [ ${PKG_LIBTOOL_MIDIPIX_FIX:-0} -eq 1 ]; then
|
|
50
|
+
sed -i.orig.orig \
|
|
51
|
+
-e '/^\s\+test \"\$inst_prefix_dir\" = \"\$destdir\" && \\$/{s/^/#/;n;s/^/#/}' \
|
|
52
|
+
${PKG_SUBDIR}/libtool.midipix;
|
|
53
|
+
fi;
|
|
49
54
|
fi;
|
|
50
55
|
set_build_script_done patch -configure;
|
|
51
56
|
fi;
|