diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-04-22 13:09:54 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-04-22 13:09:54 +0000 |
| commit | ad1a1ca65eabdfe1881619f0f9640cbf7f79d18d (patch) | |
| tree | 4dc7e356de59476705931b9c8016cdd05cadeefe | |
| parent | 15af12934ba6acb4bf38345ef33e3fdd4d946ae1 (diff) | |
| download | midipix_build-ad1a1ca65eabdfe1881619f0f9640cbf7f79d18d.tar.bz2 midipix_build-ad1a1ca65eabdfe1881619f0f9640cbf7f79d18d.tar.xz | |
- Followup to last commit:
- Don't parallelise the perl build as libdummy.so must be built before
building {cpan,ext}/.
- Iteratively append ${PKG_CFLAGS_CONFIGURE} to ccflags when building
perl as environment variables aren't considered by the configure script.
- Add missing build step `build_dir' to build.usage.
- Force the perk prefix to /usr rather than the default value of /usr/local.
| -rw-r--r-- | 100.perk.build | 4 | ||||
| -rw-r--r-- | 367.perl.vars | 5 | ||||
| -rw-r--r-- | build.usage | 4 | ||||
| -rw-r--r-- | build.vars | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/100.perk.build b/100.perk.build index 969f75d0..cb6d8059 100644 --- a/100.perk.build +++ b/100.perk.build @@ -9,7 +9,7 @@ fi; set_build_dir ${2} native; if ! is_build_script_done configure1; then rm_if_exists -m -c ${PKG_BUILD_DIR}; - ../perk/configure; + ../perk/configure --prefix=/usr; set_build_script_done configure1 clean1 -build1; else cd ${PKG_BUILD_DIR}; @@ -29,7 +29,7 @@ fi; set_build_dir ${2} cross; if ! is_build_script_done configure2; then rm_if_exists -m -c ../${PKG_BUILD_DIR}; - ../perk/configure --target=${TARGET}; + ../perk/configure --prefix=/usr --target=${TARGET}; set_build_script_done configure2 clean2 -build2; else cd ../${PKG_BUILD_DIR}; diff --git a/367.perl.vars b/367.perl.vars index 5a1cce34..68583930 100644 --- a/367.perl.vars +++ b/367.perl.vars @@ -15,7 +15,10 @@ pkg_perl_extract_post() { fi; cp ${_ppep_fname_src} ${_ppep_fname_dst}; done; - unset _ppep_fname_src _ppep_fname_dst; + for _ppep_cflag in ${PKG_CFLAGS_CONFIGURE}; do + PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_ppep_cflag}"; + done; + unset _ppep_fname_src _ppep_fname_dst _ppep_cflag; }; # vim:filetype=sh diff --git a/build.usage b/build.usage index c4d33da5..5beef932 100644 --- a/build.usage +++ b/build.usage @@ -8,8 +8,8 @@ usage: ./build.sh [-c] [-nd] [-r ALL|name[:step]] [-h] [-t] This currently only includes rm_if_exists(). -r ALL|name[:step] Restart all or the specified build script(s) completely or at the optionally specified build step. Currently defined - build steps are: fetch extract patch configure clean build - install configure1 configure2 build1 build2 install1 install2. + build steps are: fetch extract build_dir patch configure clean + build install configure1 configure2 build1 build2 install1 install2. -t Produce a distribution tarball containing $PREFIX sans $WORKDIR and $PREFIX/src/midipix_build at the end of a build with zero failures. @@ -275,6 +275,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_PERL_SHA256SUM:=2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27}; : ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz}; : ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_LVL3}/include --sysroot=${PREFIX_LVL3} --target=x86_64-nt64-midipix"}; +: ${PKG_PERL_MAKEFLAGS_BUILD:=-j1}; : ${PKG_RSYNC_VERSION:=3.1.2}; : ${PKG_RSYNC_SHA256SUM:=ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2}; : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz}; |