build / midipix_build

Clone
Source Code
GIT

fb434b Fixed rsync and util_linux, removed popt.

Authored and Committed by Lucio Andrés Illanes Albornoz (arab, vxp) 9 years ago
raw patch tree parent
10 files changed. 52 lines added. 12 lines removed.
314.openssh.build
file removed
-1
314.rsync.build
file added
+1
333.openssh.build
file added
+1
340.popt.build
file removed
-1
341.rsync.build
file removed
-1
354.util_linux.vars
file added
+11
apk-tools-2.6.6.local.patch
file added
+11
build.sh
file modified
+6 -0
build.vars
file modified
+17 -6
pkg.build
file modified
+5 -3 
    Fixed rsync and util_linux, removed popt.
file removed
-1
314.openssh.build DELETED
@@ -1 +0,0 @@
1
- pkg.build
file added
+1
314.rsync.build ADDED
@@ -0,0 +1 @@
1
+ pkg.build
file added
+1
333.openssh.build ADDED
@@ -0,0 +1 @@
1
+ pkg.build
file removed
-1
340.popt.build DELETED
@@ -1 +0,0 @@
1
- pkg.build
file removed
-1
341.rsync.build DELETED
@@ -1 +0,0 @@
1
- pkg.build
file added
+11
354.util_linux.vars ADDED
@@ -0,0 +1,11 @@
1
+ #
2
+ # . ./build.vars and set -o errexit are assumed.
3
+ #
4
+
5
+ pkg_util_linux_configure_pre() {
6
+ export NCURSESW_CFLAGS="-I${PREFIX_LVL3}/include -I${PREFIX_LVL3}/include/ncursesw";
7
+ export PKG_CONFIG_LIBDIR="${PREFIX_LVL3}/lib/pkgconfig";
8
+ export NCURSESW_LIBS="-L${PREFIX_LVL3}/lib $(env PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR} pkg-config --libs ncursesw)";
9
+ };
10
+
11
+ # vim:filetype=sh
file added
+11
apk-tools-2.6.6.local.patch ADDED
@@ -0,0 +1,11 @@
1
+ --- apk-tools-2.6.6/Make.rules.orig 2016-02-09 14:57:53.000000000 +0000
2
+ +++ apk-tools-2.6.6/Make.rules 2016-02-13 19:04:27.012687754 +0000
3
+ @@ -70,7 +70,7 @@
4
+ INSTALLDIR := $(INSTALL) -d
5
+
6
+ CFLAGS ?= -g -O2
7
+ -CFLAGS_ALL := -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
8
+ +CFLAGS_ALL := -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
9
+ CFLAGS_ALL += $(CFLAGS)
10
+
11
+ LDFLAGS ?= -g
file modified
+6 -0
build.sh CHANGED
@@ -11,6 +11,7 @@ log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)
11
11
log_env_vars ${LOG_ENV_VARS};
12
12
(mkdir -p ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_TARGET} ${WORKDIR};
13
13
BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}};
14
+ BUILD_SECS=$(command date +%s);
14
15
for BUILD_LVL in 0 1 2 3; do
15
16
for BUILD_SCRIPT_FNAME in ${BUILD_LVL}[0-9][0-9].*.build; do
16
17
if [ -n "${ARG_BUILD_SCRIPTS}" ]\
@@ -54,6 +55,11 @@ for BUILD_LVL in 0 1 2 3; do
54
55
fi;
55
56
done;
56
57
log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s).";
58
+ : $((BUILD_SECS=$(command date +%s)-${BUILD_SECS}));
59
+ : $((BUILD_HOURS=${BUILD_SECS}/3600));
60
+ : $((BUILD_MINUTES=(${BUILD_SECS}%3600)/60));
61
+ : $((BUILD_SECS=(${BUILD_SECS}%3600)%60));
62
+ log_msg info "Build time: ${BUILD_HOURS} hour(s), ${BUILD_MINUTES} minute(s), and ${BUILD_SECS} second(s).";
57
63
if [ $(( ${BUILD_NFINI} + ${BUILD_NSKIP} )) -ge 0 ]\
58
64
&& [ ${BUILD_NFAIL} -eq 0 ]\
59
65
&& [ ${ARG_TARBALL:-0} -eq 1 ]; then
file modified
+17 -6
build.vars CHANGED
@@ -23,7 +23,7 @@
23
23
: ${PREFIX:=${HOME}/midipix};
24
24
: ${PREFIX_NATIVE:=${PREFIX}/native};
25
25
: ${TARGET:=x86_64-nt64-midipix};
26
- : ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra install_target makeflags_build_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"};
26
+ : ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra install_target makeflags_build_extra makeflags_install_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"};
27
27
: ${PREFIX_TARGET:=${PREFIX}/${TARGET}};
28
28
: ${PREFIX_LVL0:=${PREFIX_TARGET}};
29
29
: ${PREFIX_LVL1:=${PREFIX_NATIVE}};
@@ -48,6 +48,14 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
48
48
: ${PKG_LVL2_LDFLAGS_PATH:=-L${PREFIX_LVL2}/include};
49
49
: ${PKG_LVL3_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
50
50
51
+ : ${PKG_APK_TOOLS_VERSION:=2.6.6};
52
+ : ${PKG_APK_TOOLS_BUILD_DIR:=apk-tools-${PKG_APK_TOOLS_VERSION}};
53
+ : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2};
54
+ : ${PKG_APK_TOOLS_CFLAGS:=-I${PREFIX_LVL3}/include};
55
+ : ${PKG_APK_TOOLS_LDFLAGS:=-L${PREFIX_LVL3}/lib};
56
+ : ${PKG_APK_TOOLS_MAKEFLAGS:=CROSS_COMPILE=${HOST_NATIVE}- LUAAPK= PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig VERBOSE=1};
57
+ : ${PKG_APK_TOOLS_NO_CONFIGURE:=1};
58
+ : ${PKG_APK_TOOLS_SHA256SUM:=7e5e86c856ce236c7fd54605ee0b1dbf59920398d3b33f9f6ff0e5f98e6828af};
51
59
: ${PKG_BZIP2_AR:=${HOST_NATIVE}-ar};
52
60
: ${PKG_BZIP2_CC:=${HOST_NATIVE}-gcc};
53
61
: ${PKG_BZIP2_RANLIB:=${HOST_NATIVE}-ranlib};
@@ -100,9 +108,11 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
100
108
: ${PKG_GIT_CC:=${HOST_NATIVE}-gcc};
101
109
: ${PKG_GIT_CFLAGS:=-I. -I${PREFIX_LVL3}/include};
102
110
: ${PKG_GIT_LDFLAGS:=-L${PREFIX_LVL3}/lib};
103
- : ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 V=99};
111
+ : ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 NO_PERL=1 PREFIX=${PREFIX_LVL3} V=99};
112
+ : ${PKG_GIT_MAKEFLAGS_INSTALL_EXTRA:=NO_CURL=1 NO_PERL=1 PREFIX=${PREFIX_LVL3} V=99};
104
113
: ${PKG_GIT_GIT_ARGS_EXTRA:=--branch v2.7.1};
105
114
: ${PKG_GIT_NO_CONFIGURE:=1};
115
+ : ${PKG_GIT_NO_DESTDIR:=1};
106
116
: ${PKG_GIT_RANLIB:=${HOST_NATIVE}-ranlib};
107
117
: ${PKG_GIT_URL:=https://github.com/git/git.git};
108
118
: ${PKG_GIT_URL_TYPE:=git};
@@ -157,6 +167,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
157
167
: ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
158
168
: ${PKG_MUSL_VERSION:=1.1.12};
159
169
: ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz};
170
+ : ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:=--with-pkg-config --with-pkg-config-libdir=${PREFIX_LVL3}/lib/pkgconfig --enable-pc-files --enable-widec};
171
+ : ${PKG_NCURSES_MAKEFLAGS_INSTALL_EXTRA:=PKG_CONFIG_LIBDIR=/lib/pkgconfig};
160
172
: ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260};
161
173
: ${PKG_NCURSES_VERSION:=6.0};
162
174
: ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};
@@ -170,11 +182,9 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
170
182
: ${PKG_PATCH_SHA256SUM:=59c29f56faa0a924827e6a60c6accd6e2900eae5c6aaa922268c717f06a62048};
171
183
: ${PKG_PATCH_VERSION:=2.7};
172
184
: ${PKG_PATCH_URL:=https://ftp.gnu.org/gnu/patch/patch-${PKG_PATCH_VERSION}.tar.gz};
173
- : ${PKG_POPT_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8};
185
+ : ${PKG_RSYNC_UNSET_VARS_BUILD:="CFLAGS LDFLAGS"};
174
- : ${PKG_POPT_VERSION:=1.16};
175
- : ${PKG_POPT_URL:=http://rpm5.org/files/popt/popt-${PKG_POPT_VERSION}.tar.gz};
176
186
: ${PKG_RSYNC_CFLAGS:=-I${PREFIX_LVL3}/include};
177
- : ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-zlib};
187
+ : ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-popt --with-included-zlib};
178
188
: ${PKG_RSYNC_LDFLAGS:=-L${PREFIX_LVL3}/lib};
179
189
: ${PKG_RSYNC_VERSION:=3.1.2};
180
190
: ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz};
@@ -187,6 +197,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
187
197
: ${PKG_UTIL_LINUX_CFLAGS:=-I${PREFIX_LVL3}/include};
188
198
: ${PKG_UTIL_LINUX_LDFLAGS:=-I${PREFIX_LVL3}/lib};
189
199
: ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-wall --disable-write};
200
+ : ${PKG_UTIL_LINUX_UNSET_VARS_BUILD:=CFLAGS LDFLAGS};
190
201
: ${PKG_UTIL_LINUX_SHA256SUM:=133c14f625d40e90e73e9d200faf3f2ce87937b99f923c84e5504ac0badc71d6};
191
202
: ${PKG_UTIL_LINUX_VERSION:=2.27.1};
192
203
: ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz};
file modified
+5 -3
pkg.build CHANGED
@@ -4,7 +4,7 @@
4
4
5
5
# Order for build level 2 (runtime:) psxtypes pemagine dalist ntapi psxscl ntcon ntctty
6
6
parse_with_pkg_name ${2} \
7
- bash binutils binutils_host bzip2 coreutils \
7
+ apk_tools bash binutils binutils_host bzip2 coreutils \
8
8
dalist dash diffutils findutils gawk git gmp \
9
9
grep gzip less libelf libressl libz make mpc mpfr \
10
10
ncurses ntapi ntcon ntctty openssh patch pemagine \
@@ -77,6 +77,8 @@ fi;
77
77
cd ${BUILD_DIR};
78
78
if [ ${PKG_NO_CONFIGURE:-0} -eq 0 ]\
79
79
&& ! is_build_script_done configure; then
80
+ command -v pkg_${PKG_NAME}_configure_pre >/dev/null \
81
+ && pkg_${PKG_NAME}_configure_pre;
80
82
../${PKG_SUBDIR}/configure \
81
83
${_configure_args} \
82
84
${PKG_CONFIGURE_ARGS_EXTRA};
@@ -105,7 +107,7 @@ if ! is_build_script_done install1; then
105
107
if command -v pkg_${PKG_NAME}_install >/dev/null; then
106
108
pkg_${PKG_NAME}_install;
107
109
elif [ ${PKG_NO_DESTDIR:-0} -eq 0 ]; then
108
- make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_BUILD_EXTRA}}\
110
+ make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_INSTALL_EXTRA}}\
109
111
${MAKEFLAGS} \
110
112
${AR:+AR=${AR}} \
111
113
${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"} \
@@ -114,7 +116,7 @@ if ! is_build_script_done install1; then
114
116
DESTDIR=${PREFIX_LVL} \
115
117
${PKG_INSTALL_TARGET:-install};
116
118
else
117
- make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_BUILD_EXTRA}}\
119
+ make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_INSTALL_EXTRA}}\
118
120
${MAKEFLAGS} \
119
121
${AR:+AR=${AR}} \
120
122
${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"} \

Powered by Pagure 5.13.3

SSH Hostkey/Fingerprint | Documentation | About

© Red Hat, Inc. and others.