From: Hugo Villeneuve Date: Sat, 27 Dec 2014 20:27:25 +0000 (-0500) Subject: Update for new BUILD_DIR and SRC_DIR variables X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=582e550b16726c1391156a831baaf33c29a7a38f;p=hvlinux.git Update for new BUILD_DIR and SRC_DIR variables --- diff --git a/stage0/pkg/cloog b/stage0/pkg/cloog index 8e278d2..4891a4c 100644 --- a/stage0/pkg/cloog +++ b/stage0/pkg/cloog @@ -3,5 +3,5 @@ hvconfig_post() { # Apply a sed which prevents the attempted installation of an invalid file: - sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile + sed -i '/cmake/d' ${BUILD_DIR}/Makefile } diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc index 489a3f3..fab1a51 100644 --- a/stage0/pkg/gcc +++ b/stage0/pkg/gcc @@ -75,7 +75,7 @@ hvconfig_pre() --enable-libstdcxx-time \ --enable-threads=posix" - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} # Change the StartFile Spec to point to the correct library location: echo -en '\n' >> gcc/config/linux.h diff --git a/stage0/pkg/glibc b/stage0/pkg/glibc index 9bccb98..32acf8f 100644 --- a/stage0/pkg/glibc +++ b/stage0/pkg/glibc @@ -28,7 +28,7 @@ hvconfig_pre() # For Glibc to support NPTL: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes diff --git a/stage0/pkg/kernel-headers b/stage0/pkg/kernel-headers index 6a67dad..7f64ff0 100644 --- a/stage0/pkg/kernel-headers +++ b/stage0/pkg/kernel-headers @@ -2,9 +2,6 @@ hvbuild() { - # Install headers - cd ${LFS_TMP}/${PACKAGE} - local DESTDIR=${TOOLS_DIR}/include install -dv ${DESTDIR} diff --git a/stage1/pkg/bash b/stage1/pkg/bash index dc30252..dd9ae53 100644 --- a/stage1/pkg/bash +++ b/stage1/pkg/bash @@ -8,7 +8,7 @@ # that can not run while cross-compiling or that do not run properly: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_strcoll_works=yes ac_cv_func_working_mktime=yes diff --git a/stage1/pkg/bzip2 b/stage1/pkg/bzip2 index 56bd28c..d81667a 100644 --- a/stage1/pkg/bzip2 +++ b/stage1/pkg/bzip2 @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - # Bzip2's default Makefile target automatically runs the testsuite as well. # Disable the tests since they won't work on a multi-architecture build: sed -e 's@^\(all:.*\) test@\1@g' -i Makefile diff --git a/stage1/pkg/cloog b/stage1/pkg/cloog index 8e278d2..4891a4c 100644 --- a/stage1/pkg/cloog +++ b/stage1/pkg/cloog @@ -3,5 +3,5 @@ hvconfig_post() { # Apply a sed which prevents the attempted installation of an invalid file: - sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile + sed -i '/cmake/d' ${BUILD_DIR}/Makefile } diff --git a/stage1/pkg/coreutils b/stage1/pkg/coreutils index d8de2a7..f04cb86 100644 --- a/stage1/pkg/coreutils +++ b/stage1/pkg/coreutils @@ -2,7 +2,7 @@ hvconfig_post() { - cd ${LFS_TMP}/${PACKAGE} + cd ${BUILD_DIR} sed -e 's/^#\(run_help2man.*dummy-man\)/\1/' \ -e 's/^\(run_help2man.*PERL.*\)/#\1/' \ -i Makefile @@ -16,7 +16,7 @@ hvconfig_post() # config.cache to correct this, and fix various cross-compiling issues: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF fu_cv_sys_stat_statfs2_bsize=yes gl_cv_func_working_mkstemp=yes EOF diff --git a/stage1/pkg/findutils b/stage1/pkg/findutils index 94cc2fc..7a550fe 100644 --- a/stage1/pkg/findutils +++ b/stage1/pkg/findutils @@ -4,7 +4,7 @@ # cross-compiling: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF gl_cv_func_wcwidth_works=yes ac_cv_func_fnmatch_gnu=yes EOF diff --git a/stage1/pkg/flex b/stage1/pkg/flex index 63c19d8..b8ce278 100644 --- a/stage1/pkg/flex +++ b/stage1/pkg/flex @@ -3,14 +3,14 @@ hvconfig_pre() { # Make sure that Flex doesn't try to include headers from /usr/include. - sed -e "s/-I@includedir@//g" -i ${LFS_TMP}/${PACKAGE}/Makefile.in + sed -e "s/-I@includedir@//g" -i ${SRC_DIR}/Makefile.in } # When Cross Compiling the configure script does not determine the correct # values for the following, Set the values manually: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes EOF diff --git a/stage1/pkg/gawk b/stage1/pkg/gawk index a3184e1..d9b556f 100644 --- a/stage1/pkg/gawk +++ b/stage1/pkg/gawk @@ -3,5 +3,5 @@ hvconfig_pre() { sed -e 's/check-recursive all-recursive: check-for-shared-lib-support/check-recursive all-recursive:/' \ - -i ${LFS_TMP}/${PACKAGE}/extension/Makefile.in + -i ${SRC_DIR}/extension/Makefile.in } diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc index c6c4894..c499c06 100644 --- a/stage1/pkg/gcc +++ b/stage1/pkg/gcc @@ -16,7 +16,7 @@ hvconfig_pre() --enable-libstdcxx-time \ --enable-languages=c,c++" - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} # Change the StartFile Spec to point to the correct library location: echo -en '\n' >> gcc/config/linux.h @@ -49,5 +49,5 @@ hvbuild() hvbuild_post() { # Install the libiberty header file that is needed by some packages: - cp -v ${LFS_TMP}/${PACKAGE}/include/libiberty.h ${TOOLS_DIR}/include + cp -v ${SRC_DIR}/include/libiberty.h ${TOOLS_DIR}/tools/include } diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext index 0739758..cf4b78d 100644 --- a/stage1/pkg/gettext +++ b/stage1/pkg/gettext @@ -5,7 +5,7 @@ # errors because of this assumption: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF gl_cv_func_wcwidth_works=yes EOF } diff --git a/stage1/pkg/grep b/stage1/pkg/grep index 1d6dc4f..2ef77c8 100644 --- a/stage1/pkg/grep +++ b/stage1/pkg/grep @@ -4,7 +4,7 @@ # for the following, Set the values manually: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes EOF diff --git a/stage1/pkg/m4 b/stage1/pkg/m4 index 38f969c..93d5abd 100644 --- a/stage1/pkg/m4 +++ b/stage1/pkg/m4 @@ -3,7 +3,7 @@ # Configure can not properly determine the results of the following tests: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF gl_cv_func_btowc_eof=yes gl_cv_func_mbrtowc_incomplete_state=yes gl_cv_func_mbrtowc_sanitycheck=yes diff --git a/stage1/pkg/patch b/stage1/pkg/patch index 2742671..ef6d3a1 100644 --- a/stage1/pkg/patch +++ b/stage1/pkg/patch @@ -4,7 +4,7 @@ # certain features: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF ac_cv_func_strnlen_working=yes EOF } diff --git a/stage1/pkg/sysvinit b/stage1/pkg/sysvinit index 874cc06..7d50115 100644 --- a/stage1/pkg/sysvinit +++ b/stage1/pkg/sysvinit @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - sed -e "s@/usr/lib@/tools/lib@" \ -i src/Makefile diff --git a/stage1/pkg/tar b/stage1/pkg/tar index 5946e74..d6206ea 100644 --- a/stage1/pkg/tar +++ b/stage1/pkg/tar @@ -3,7 +3,7 @@ # Configure can not properly determine the results of a few tests. hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF gl_cv_func_wcwidth_works=yes gl_cv_func_btowc_eof=yes ac_cv_func_malloc_0_nonnull=yes diff --git a/stage1/pkg/util-linux b/stage1/pkg/util-linux index 5778f60..3b57fa9 100644 --- a/stage1/pkg/util-linux +++ b/stage1/pkg/util-linux @@ -4,7 +4,7 @@ # cross-compiling: hvconfig_cache() { -cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF +cat > ${BUILD_DIR}/config.cache << EOF scanf_cv_type_modifier=as EOF } diff --git a/stage2/pkg/bzip2 b/stage2/pkg/bzip2 index dae7691..f156872 100644 --- a/stage2/pkg/bzip2 +++ b/stage2/pkg/bzip2 @@ -2,12 +2,14 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make -f Makefile-libbz2_so make clean make -j ${MAKEJOBS} make PREFIX=/usr install +} +hvbuild_post() +{ cp -fv bzip2-shared /bin/bzip2 cp -afv libbz2.so* /lib ln -sfvT ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so diff --git a/stage2/pkg/cloog b/stage2/pkg/cloog index 8e278d2..4891a4c 100644 --- a/stage2/pkg/cloog +++ b/stage2/pkg/cloog @@ -3,5 +3,5 @@ hvconfig_post() { # Apply a sed which prevents the attempted installation of an invalid file: - sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile + sed -i '/cmake/d' ${BUILD_DIR}/Makefile } diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp index a25fe74..0c78176 100644 --- a/stage2/pkg/dhcp +++ b/stage2/pkg/dhcp @@ -2,8 +2,8 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} - sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in + sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' \ + ${SRC_DIR}/server/Makefile.in CONFIGURE_OPTS+=" \ --localstatedir=/var \ @@ -16,7 +16,8 @@ hvconfig_pre() hvconfig_post() { - sed -i 's/-Werror//' {client,common,dst,omapip,relay,server,tests}/Makefile + sed -i 's/-Werror//' \ + ${BUILD_DIR}/{client,common,dst,omapip,relay,server,tests}/Makefile } hvbuild_post() diff --git a/stage2/pkg/diffutils b/stage2/pkg/diffutils index 9c919b8..3127535 100644 --- a/stage2/pkg/diffutils +++ b/stage2/pkg/diffutils @@ -4,5 +4,5 @@ hvconfig_pre() { # A patch will cause the Diffutils build system to attempt to rebuild # the diff.1 man page using the unavailable program help2man: - touch ${LFS_TMP}/${PACKAGE}/man/diff.1 + touch ${SRC_DIR}/man/diff.1 } diff --git a/stage2/pkg/firmware-b43-lpphy b/stage2/pkg/firmware-b43-lpphy index fe05de2..be56e27 100644 --- a/stage2/pkg/firmware-b43-lpphy +++ b/stage2/pkg/firmware-b43-lpphy @@ -4,7 +4,7 @@ hvbuild() { local FIRMWARE_INSTALL_DIR="/lib/firmware" - cd ${LFS_TMP}/${PACKAGE}/linux + cd ${SRC_DIR}/linux b43-fwcutter -w ${FIRMWARE_INSTALL_DIR} wl_apsta.o } diff --git a/stage2/pkg/gcc b/stage2/pkg/gcc index efde04b..f3b4e73 100644 --- a/stage2/pkg/gcc +++ b/stage2/pkg/gcc @@ -27,7 +27,7 @@ hvconfig_post() hvbuild_post() { # Install the libiberty header file that is needed by some packages: - cp -v ${LFS_TMP}/${PACKAGE}/include/libiberty.h /usr/include + cp -v ${SRC_DIR}/include/libiberty.h /usr/include ln -svf ../usr/bin/cpp /lib ln -svf gcc /usr/bin/cc diff --git a/stage2/pkg/glibc b/stage2/pkg/glibc index b98c282..2b51e32 100644 --- a/stage2/pkg/glibc +++ b/stage2/pkg/glibc @@ -11,8 +11,6 @@ hvconfig_pre() --enable-obsolete-rpc \ --libexecdir=/usr/lib/glibc" - cd ${LFS_TMP}/${PACKAGE} - # When running make install, a script called test-installation.pl performs a # small sanity test on our newly installed Glibc. However, because our # toolchain still points to the /tools directory, the sanity test would be @@ -21,15 +19,13 @@ hvconfig_pre() LINKER=$(readelf -l /tools/bin/bash | \ sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \ - scripts/test-installation.pl + ${SRC_DIR}/scripts/test-installation.pl unset LINKER - cd ${LFS_TMP}/${PACKAGE}-build - case "${HVL_TARGET}" in "x86_64") # Tell glibc to install its libraries into /lib: - echo "slibdir=/lib" >> configparms + echo "slibdir=/lib" >> ${BUILD_DIR}/configparms CONFIGURE_OPTS+=" --libdir=/usr/lib" ;; esac @@ -73,7 +69,7 @@ hvbuild() esac # Install the configuration file and runtime directory for nscd: - cp -v ${LFS_TMP}/${PACKAGE}/nscd/nscd.conf /etc/nscd.conf + cp -v ${SRC_DIR}/nscd/nscd.conf /etc/nscd.conf mkdir -pv /var/cache/nscd # The following instructions, instead of the install-locales target diff --git a/stage2/pkg/gptfdisk b/stage2/pkg/gptfdisk index 20556f1..1a1c78d 100644 --- a/stage2/pkg/gptfdisk +++ b/stage2/pkg/gptfdisk @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make gdisk install gdisk /usr/bin } diff --git a/stage2/pkg/icu b/stage2/pkg/icu index de2fa60..dd4a78f 100644 --- a/stage2/pkg/icu +++ b/stage2/pkg/icu @@ -2,7 +2,7 @@ hvconfig() { - cd ${LFS_TMP}/${PACKAGE}/source + cd ${SRC_DIR}/source ./configure ${CONFIGURE_OPTS} } diff --git a/stage2/pkg/iproute2 b/stage2/pkg/iproute2 index 7c937b3..173e5d8 100644 --- a/stage2/pkg/iproute2 +++ b/stage2/pkg/iproute2 @@ -5,13 +5,11 @@ hvconfig_pre() # The arpd binary included in this package is dependent on Berkeley DB. # Because arpd is not a very common requirement on a base Linux system, # remove the dependency on Berkeley DB by applying the sed command below - sed -i '/^TARGETS/s@arpd@@g' ${LFS_TMP}/${PACKAGE}/misc/Makefile + sed -i '/^TARGETS/s@arpd@@g' ${SRC_DIR}/misc/Makefile } hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - # DESTDIR= # This ensures that the IPRoute2 binaries will install into the correct # directory. By default, DESTDIR is set to /usr. diff --git a/stage2/pkg/kernel b/stage2/pkg/kernel index d2e8fe1..403377b 100644 --- a/stage2/pkg/kernel +++ b/stage2/pkg/kernel @@ -3,7 +3,7 @@ hvbuild() { rm -rf /usr/src/${PACKAGE} - mv ${LFS_TMP}/${PACKAGE} /usr/src + mv ${SRC_DIR} /usr/src cd /usr/src/${PACKAGE} diff --git a/stage2/pkg/kernel-headers b/stage2/pkg/kernel-headers index 35810b3..95caa30 100644 --- a/stage2/pkg/kernel-headers +++ b/stage2/pkg/kernel-headers @@ -2,9 +2,6 @@ hvbuild() { - # Install headers - cd ${LFS_TMP}/${PACKAGE} - local DESTDIR=/usr/include ${HVMAKE} mrproper diff --git a/stage2/pkg/perl b/stage2/pkg/perl index b4530e2..d1f11cf 100644 --- a/stage2/pkg/perl +++ b/stage2/pkg/perl @@ -8,7 +8,7 @@ hvconfig_pre() sed -e '/^BUILD_ZLIB/s/True/False/' \ -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \ -e '/^LIB/s,\./zlib-src,/usr/lib,' \ - -i ${LFS_TMP}/${PACKAGE}/cpan/Compress-Raw-Zlib/config.in + -i ${SRC_DIR}/cpan/Compress-Raw-Zlib/config.in CONFIGURE_OPTS="\ --prefix=/usr \ @@ -22,6 +22,6 @@ hvconfig_pre() hvconfig() { - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} ./configure.gnu ${CONFIGURE_OPTS} } diff --git a/stage2/pkg/procps b/stage2/pkg/procps index fcd1afc..00ed609 100644 --- a/stage2/pkg/procps +++ b/stage2/pkg/procps @@ -3,5 +3,5 @@ hvconfig_pre() { # The following fixes an issue with Make 3.82: - sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' ${LFS_TMP}/${PACKAGE}/Makefile + sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' ${SRC_DIR}/Makefile } diff --git a/stage2/pkg/readline b/stage2/pkg/readline index 452be2f..da4b0af 100644 --- a/stage2/pkg/readline +++ b/stage2/pkg/readline @@ -4,14 +4,12 @@ hvconfig_pre() { CONFIGURE_OPTS+=" --libdir=/lib" - cd ${LFS_TMP}/${PACKAGE} - # Reinstalling Readline will cause the old libraries to be moved to # .old. While this is normally not a problem, in some # cases it can trigger a linking bug in ldconfig. This can be # avoided by issuing the following two seds: - sed -i '/MV.*old/d' Makefile.in - sed -i '/{OLDSUFF}/c:' support/shlib-install + sed -i '/MV.*old/d' ${SRC_DIR}/Makefile.in + sed -i '/{OLDSUFF}/c:' ${SRC_DIR}/support/shlib-install } hvbuild() diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow index 11d9ba9..fb083b1 100644 --- a/stage2/pkg/shadow +++ b/stage2/pkg/shadow @@ -4,7 +4,7 @@ hvconfig_pre() { CONFIGURE_OPTS+=" --without-selinux" - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} # Disable the installation of the groups program and its man page, as # Coreutils provides a better version. diff --git a/stage2/pkg/sysklogd b/stage2/pkg/sysklogd index dcd22d9..ab133ed 100644 --- a/stage2/pkg/sysklogd +++ b/stage2/pkg/sysklogd @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - make make BINDIR=/sbin install } diff --git a/stage2/pkg/tzdata b/stage2/pkg/tzdata index 7785f23..bed72b5 100644 --- a/stage2/pkg/tzdata +++ b/stage2/pkg/tzdata @@ -2,10 +2,10 @@ hvbuild() { - mkdir -pv ${LFS_TMP}/${PACKAGE} - decompress_package ${TZDATA} ${LFS_TMP}/${PACKAGE} + mkdir -pv ${SRC_DIR} + decompress_package ${TZDATA} ${SRC_DIR} - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} ZONEINFO=/usr/share/zoneinfo diff --git a/stage2/pkg/wireless-tools b/stage2/pkg/wireless-tools index 19ad589..9747dbe 100644 --- a/stage2/pkg/wireless-tools +++ b/stage2/pkg/wireless-tools @@ -3,7 +3,7 @@ hvconfig_pre() { sed -e "s!^\(INSTALL_DIR=\).*!\1/sbin!" \ - -e "s!^\(INSTALL_LIB=\).*!\1/lib!" -i ${LFS_TMP}/${PACKAGE}/Makefile + -e "s!^\(INSTALL_LIB=\).*!\1/lib!" -i ${SRC_DIR}/Makefile } hvbuild_post() diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant index 3313249..2419f34 100644 --- a/stage2/pkg/wpa_supplicant +++ b/stage2/pkg/wpa_supplicant @@ -2,7 +2,7 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE}/wpa_supplicant + cd ${SRC_DIR}/wpa_supplicant cat > .config << "EOF" CONFIG_BACKEND=file diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index d936200..3769565 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -172,7 +172,7 @@ else ipkg ${MSMTP} fi -ipkg ${PTH} "\ +ipkg -m acnb ${PTH} "\ --disable-static \ --mandir=/usr/share/man" ipkg ${LIBASSUAN} diff --git a/stage3/pkg/OpenSP b/stage3/pkg/OpenSP index 8f899f2..e4d49b3 100644 --- a/stage3/pkg/OpenSP +++ b/stage3/pkg/OpenSP @@ -20,7 +20,7 @@ hvconfig_pre() fi fi - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} sed -i 's:32,:253,:' lib/Syntax.cxx sed -i 's:LITLEN 240 :LITLEN 8092:' \ unicode/{gensyntax.pl,unicode.syn} diff --git a/stage3/pkg/SGMLSpm b/stage3/pkg/SGMLSpm index d03e850..49c9a3c 100644 --- a/stage3/pkg/SGMLSpm +++ b/stage3/pkg/SGMLSpm @@ -2,9 +2,8 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} sed -i -e "s@/usr/local/bin@/usr/bin@" \ -e "s@/usr/local/lib/perl5@/usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})@" \ -e "s@/usr/local/lib/www/docs@/usr/share/doc/perl5@" \ - Makefile + ${SRC_DIR}/Makefile } diff --git a/stage3/pkg/ack b/stage3/pkg/ack index a421df9..20aafc3 100644 --- a/stage3/pkg/ack +++ b/stage3/pkg/ack @@ -2,6 +2,6 @@ hvbuild() { - install -v -m 755 ${LFS_TMP}/${PACKAGE}/ack /usr/bin + install -v -m 755 ${SRC_DIR}/ack /usr/bin string_add "alias ack='ack --pager=\"less -RFX\"'" /etc/bashrc } diff --git a/stage3/pkg/bash-completion b/stage3/pkg/bash-completion index 3512b5d..19dd3ae 100644 --- a/stage3/pkg/bash-completion +++ b/stage3/pkg/bash-completion @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - install -m644 bash_completion.sh /etc/profile.d/70-bash_completion.sh cp -v bash_completion /etc/ install -d /etc/bash_completion.d diff --git a/stage3/pkg/ckermit b/stage3/pkg/ckermit index 92d9276..efd2397 100644 --- a/stage3/pkg/ckermit +++ b/stage3/pkg/ckermit @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make linux make prefix=/usr install } diff --git a/stage3/pkg/cmake b/stage3/pkg/cmake index 5a8da49..fe8b64b 100644 --- a/stage3/pkg/cmake +++ b/stage3/pkg/cmake @@ -2,7 +2,7 @@ hvconfig() { - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} ./bootstrap --prefix=/usr \ --system-libs \ diff --git a/stage3/pkg/colordiff b/stage3/pkg/colordiff index 78c8393..3a5231c 100644 --- a/stage3/pkg/colordiff +++ b/stage3/pkg/colordiff @@ -2,8 +2,10 @@ hvbuild() { - PREFIX=/usr make -C ${LFS_TMP}/${PACKAGE} install + make PREFIX=/usr install +} +hvbuild_post() +{ install -v -m644 ${SCRDIR}/misc/colordiffrc /etc } - diff --git a/stage3/pkg/cpio b/stage3/pkg/cpio index 1792478..e3d6210 100644 --- a/stage3/pkg/cpio +++ b/stage3/pkg/cpio @@ -2,7 +2,7 @@ hvconfig_pre() { - sed -i -e '/gets is a/d' ${LFS_TMP}/${PACKAGE}/gnu/stdio.in.h + sed -i -e '/gets is a/d' ${SRC_DIR}/gnu/stdio.in.h } hvbuild_post() diff --git a/stage3/pkg/cyrus-sasl b/stage3/pkg/cyrus-sasl index 0f6f5bf..d1df97d 100644 --- a/stage3/pkg/cyrus-sasl +++ b/stage3/pkg/cyrus-sasl @@ -3,7 +3,7 @@ hvconfig_pre() { sed -i 's/#elif WITH_DES/#elif defined(WITH_DES)/' \ - ${LFS_TMP}/${PACKAGE}/plugins/digestmd5.c + ${SRC_DIR}/plugins/digestmd5.c CONFIGURE_OPTS+=" \ --with-dbpath=/var/lib/sasl/sasldb2 \ @@ -20,8 +20,6 @@ hvconfig_pre() hvbuild_post() { if [ "x${HVLABEL}" = "x${PACKAGE}-pass1" ]; then - cd ${LFS_TMP}/${PACKAGE} - install -v -m700 -d /var/lib/sasl install -v -m711 -d /var/run/saslauthd diff --git a/stage3/pkg/ddclient b/stage3/pkg/ddclient index 2a3d29d..2d210d5 100644 --- a/stage3/pkg/ddclient +++ b/stage3/pkg/ddclient @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} install ddclient /usr/sbin mkdir -p /etc/ddclient cp sample-etc_ddclient.conf /etc/ddclient/ddclient.conf diff --git a/stage3/pkg/docbook-dsssl b/stage3/pkg/docbook-dsssl index 5382ad2..4d283fd 100644 --- a/stage3/pkg/docbook-dsssl +++ b/stage3/pkg/docbook-dsssl @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - install -v -m755 bin/collateindex.pl /usr/bin install -v -m644 bin/collateindex.pl.1 /usr/share/man/man1 install -v -d -m755 \ diff --git a/stage3/pkg/docbook-utils b/stage3/pkg/docbook-utils index f822667..158bcfb 100644 --- a/stage3/pkg/docbook-utils +++ b/stage3/pkg/docbook-utils @@ -2,8 +2,7 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} - sed -i 's:/html::' doc/HTML/Makefile.in + sed -i 's:/html::' ${SRC_DIR}/doc/HTML/Makefile.in } hvbuild_post() diff --git a/stage3/pkg/docbook-xml b/stage3/pkg/docbook-xml index 7469544..d415672 100644 --- a/stage3/pkg/docbook-xml +++ b/stage3/pkg/docbook-xml @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} install -v -d -m755 /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER} install -v -d -m755 /etc/xml chown -R root:root . diff --git a/stage3/pkg/docbook-xsl b/stage3/pkg/docbook-xsl index da1341b..e409f41 100644 --- a/stage3/pkg/docbook-xsl +++ b/stage3/pkg/docbook-xsl @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - install -v -m 755 -d \ /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER} chown -R root:root . diff --git a/stage3/pkg/dosfstools b/stage3/pkg/dosfstools index c9e35f2..5db98dc 100644 --- a/stage3/pkg/dosfstools +++ b/stage3/pkg/dosfstools @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make make PREFIX=/usr SBINDIR=/sbin install } diff --git a/stage3/pkg/ladspa b/stage3/pkg/ladspa index 9ec50bc..2111b1d 100644 --- a/stage3/pkg/ladspa +++ b/stage3/pkg/ladspa @@ -2,5 +2,5 @@ hvbuild() { - install -m 644 ${LFS_TMP}/${PACKAGE}/src/ladspa.h /usr/include + install -m 644 ${SRC_DIR}/src/ladspa.h /usr/include } diff --git a/stage3/pkg/mysql b/stage3/pkg/mysql index 75d4a7e..deeecd9 100644 --- a/stage3/pkg/mysql +++ b/stage3/pkg/mysql @@ -8,7 +8,7 @@ hvconfig_pre() hvconfig() { - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} mkdir build cd build @@ -39,6 +39,8 @@ hvconfig() hvbuild() { + cd ${SRC_DIR}/build + make SEGMENTS="Client Server IniFiles ManPages SharedLibraries" diff --git a/stage3/pkg/openssl b/stage3/pkg/openssl index 863696e..b38e9b0 100644 --- a/stage3/pkg/openssl +++ b/stage3/pkg/openssl @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - MAKEDEPPROG=gcc CC=gcc ./config \ --prefix=/usr \ --openssldir=/etc/ssl \ diff --git a/stage3/pkg/pciutils b/stage3/pkg/pciutils index 429b0dc..9bddc02 100644 --- a/stage3/pkg/pciutils +++ b/stage3/pkg/pciutils @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - # ZLIB=no: Prevents compression of the pci.ids file. make PREFIX=/usr \ SHAREDIR=/usr/share/misc \ diff --git a/stage3/pkg/rpcbind b/stage3/pkg/rpcbind index 1c6c0bb..6faf94b 100644 --- a/stage3/pkg/rpcbind +++ b/stage3/pkg/rpcbind @@ -2,8 +2,7 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} - + cd ${SRC_DIR} sed -i '/servname/s:rpcbind:sunrpc:' src/rpcbind.c sed -i '/error = getaddrinfo/s:rpcbind:sunrpc:' src/rpcinfo.c } diff --git a/stage3/pkg/sendmail b/stage3/pkg/sendmail index 12fb7f9..85fa3d0 100644 --- a/stage3/pkg/sendmail +++ b/stage3/pkg/sendmail @@ -9,7 +9,6 @@ hvbuild() mkdir -p /var/spool/mqueue mkdir -p /etc/mail - cd ${LFS_TMP}/${PACKAGE} cat > devtools/Site/site.config.m4 << "EOF" define(`confMANGRP',`root') define(`confMANOWN',`root') @@ -143,14 +142,14 @@ Connect:192.168.0 RELAY EOF cd /etc/mail - cp -R ${LFS_TMP}/${PACKAGE}/cf/* . + cp -R ${SRC_DIR}/cf/* . cat > /etc/mail/submit.mc << "EOF" dnl include(`./m4/cf.m4')dnl dnl EOF - cat ${LFS_TMP}/${PACKAGE}/cf/cf/submit.mc >> /etc/mail/submit.mc + cat ${SRC_DIR}/cf/cf/submit.mc >> /etc/mail/submit.mc sed -i "s!\(^FEATURE.*\)127.0.0.1\(.*\)!\1${MACHINE_NAME}\.${DOMAIN}\2!" /etc/mail/submit.mc newaliases -v diff --git a/stage3/pkg/sgml-common b/stage3/pkg/sgml-common index 4ab4dd6..663e6e3 100644 --- a/stage3/pkg/sgml-common +++ b/stage3/pkg/sgml-common @@ -4,8 +4,8 @@ hvconfig_pre() { # This package does not distribute some autoconf files, and symlinks them # to /usr/share/automake. - cd ${LFS_TMP}/${PACKAGE} - autoreconf -f -i + cd ${SRC_DIR} + autoreconf -f -vi CAT1="/etc/sgml/sgml-ent.cat" CAT2="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog" diff --git a/stage3/pkg/sgml-dtd3 b/stage3/pkg/sgml-dtd3 index 5bdaad2..cb92c33 100644 --- a/stage3/pkg/sgml-dtd3 +++ b/stage3/pkg/sgml-dtd3 @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} sed -i -e '/ISO 8879/d' \ -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' \ docbook.cat diff --git a/stage3/pkg/sgml-dtd4 b/stage3/pkg/sgml-dtd4 index cd9c715..7114ba3 100644 --- a/stage3/pkg/sgml-dtd4 +++ b/stage3/pkg/sgml-dtd4 @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} sed -i -e '/ISO 8879/d' \ -e '/gml/d' docbook.cat install -v -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER} diff --git a/stage3/pkg/shadow b/stage3/pkg/shadow index c544701..6745931 100644 --- a/stage3/pkg/shadow +++ b/stage3/pkg/shadow @@ -5,7 +5,7 @@ hvconfig_pre() CONFIGURE_OPTS+=" \ --without-selinux" - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} # Disable the installation of the groups program and its man page, as # Coreutils provides a better version. diff --git a/stage3/pkg/tcp_wrappers b/stage3/pkg/tcp_wrappers index 70ff65f..0616a1d 100644 --- a/stage3/pkg/tcp_wrappers +++ b/stage3/pkg/tcp_wrappers @@ -2,8 +2,7 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} - sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c + sed -i -e "s,^extern char \*malloc();,/* & */," ${SRC_DIR}/scaffold.c } hvbuild() diff --git a/stage3/pkg/unrar b/stage3/pkg/unrar index 6cdfed2..70b58b0 100644 --- a/stage3/pkg/unrar +++ b/stage3/pkg/unrar @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make -f makefile install -v -m755 unrar /usr/bin } diff --git a/stage3/pkg/unzip b/stage3/pkg/unzip index d287e08..4e4273d 100644 --- a/stage3/pkg/unzip +++ b/stage3/pkg/unzip @@ -10,7 +10,6 @@ hvbuild() UNZIP_TARGET=linux esac - cd ${LFS_TMP}/${PACKAGE} make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 ${UNZIP_TARGET} make prefix=/usr install } diff --git a/stage3/pkg/xmltoman b/stage3/pkg/xmltoman index be7ba06..94103e1 100644 --- a/stage3/pkg/xmltoman +++ b/stage3/pkg/xmltoman @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make PREFIX=/usr - make install PREFIX=/usr + make PREFIX=/usr install } diff --git a/stage3/pkg/zip b/stage3/pkg/zip index 8cc7696..2fbd8da 100644 --- a/stage3/pkg/zip +++ b/stage3/pkg/zip @@ -2,9 +2,8 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} sed -i -e 's@$(INSTALL) man/zip.1@$(INSTALL_PROGRAM) man/zip.1@' \ - unix/Makefile + ${SRC_DIR}/unix/Makefile } hvbuild() diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib index de43784..38b5af0 100644 --- a/stage4/pkg/MesaLib +++ b/stage4/pkg/MesaLib @@ -32,5 +32,5 @@ hvconfig_pre() # Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS # and CXXFLAGS with this command: - sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${LFS_TMP}/${PACKAGE}/configure + sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${SRC_DIR}/configure } diff --git a/stage4/pkg/xterm b/stage4/pkg/xterm index 32e85e4..067eab5 100644 --- a/stage4/pkg/xterm +++ b/stage4/pkg/xterm @@ -2,8 +2,8 @@ hvconfig_pre() { - sed -i '/v0/,+1s/new:/new:kb=^?:/' ${LFS_TMP}/${PACKAGE}/termcap - echo -e '\tkbs=\\177,' >> ${LFS_TMP}/${PACKAGE}/terminfo + sed -i '/v0/,+1s/new:/new:kb=^?:/' ${SRC_DIR}/termcap + echo -e '\tkbs=\\177,' >> ${SRC_DIR}/terminfo export TERMINFO=/usr/share/terminfo CONFIGURE_OPTS+=" \ diff --git a/stage5/pkg/FontForge b/stage5/pkg/FontForge index 49caba8..e10067b 100644 --- a/stage5/pkg/FontForge +++ b/stage5/pkg/FontForge @@ -2,7 +2,7 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} rm -rf libltdl ./bootstrap diff --git a/stage5/pkg/apache b/stage5/pkg/apache index 4e8c1dc..99b7de6 100644 --- a/stage5/pkg/apache +++ b/stage5/pkg/apache @@ -4,9 +4,7 @@ CONFDIR=/etc/httpd hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} - - cat >> config.layout << "EOF" && + cat >> ${SRC_DIR}/config.layout << "EOF" && # BLFS FHS layout prefix: /usr diff --git a/stage5/pkg/boost b/stage5/pkg/boost index b7351bb..4172c0d 100644 --- a/stage5/pkg/boost +++ b/stage5/pkg/boost @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} ./bootstrap.sh --prefix=/usr ./b2 stage threading=multi link=shared ./b2 install threading=multi link=shared diff --git a/stage5/pkg/cdrtools b/stage5/pkg/cdrtools index 37228ad..8442f83 100644 --- a/stage5/pkg/cdrtools +++ b/stage5/pkg/cdrtools @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install diff --git a/stage5/pkg/chordpack b/stage5/pkg/chordpack index f68713f..80a200d 100644 --- a/stage5/pkg/chordpack +++ b/stage5/pkg/chordpack @@ -7,8 +7,8 @@ hvbuild() hvbuild_post() { - install -v -m755 ${LFS_TMP}/${PACKAGE}/chordpack /usr/local/bin + install -v -m755 ${SRC_DIR}/chordpack /usr/local/bin # Install Emacs Chordpro mode - install -v -m644 ${LFS_TMP}/${PACKAGE}/chordpro-mode.el ${EMACS_LOCAL_SITE_LISP} + install -v -m644 ${SRC_DIR}/chordpro-mode.el ${EMACS_LOCAL_SITE_LISP} } diff --git a/stage5/pkg/cups-pdf b/stage5/pkg/cups-pdf index 269137e..926577e 100644 --- a/stage5/pkg/cups-pdf +++ b/stage5/pkg/cups-pdf @@ -2,11 +2,11 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE}/src + cd ${SRC_DIR}/src gcc -O9 -s -o cups-pdf cups-pdf.c install -v -m 0700 cups-pdf /usr/lib/cups/backend - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} cp extra/cups-pdf.conf /etc/cups cp extra/CUPS-PDF.ppd /usr/share/cups/model } diff --git a/stage5/pkg/dvd-rw-tools b/stage5/pkg/dvd-rw-tools index c29ee3b..bf7de18 100644 --- a/stage5/pkg/dvd-rw-tools +++ b/stage5/pkg/dvd-rw-tools @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make all rpl8 btcflash make prefix=/usr install install -v -m644 -D index.html /usr/share/doc/${PACKAGE}/index.html diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox index ba7940f..cc08c0b 100644 --- a/stage5/pkg/firefox +++ b/stage5/pkg/firefox @@ -6,7 +6,7 @@ hvbuild() FIREFOX_VERSION="$(get_pkg_ver ${PACKAGE})" FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})" - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} # Use the default settings specified in the source tree. echo '. $topsrcdir/browser/config/mozconfig' > .mozconfig diff --git a/stage5/pkg/foo2zjs b/stage5/pkg/foo2zjs index 618e09c..712811f 100644 --- a/stage5/pkg/foo2zjs +++ b/stage5/pkg/foo2zjs @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - make ./getweb 1020 make install diff --git a/stage5/pkg/ghostscript b/stage5/pkg/ghostscript index 3956367..17f519c 100644 --- a/stage5/pkg/ghostscript +++ b/stage5/pkg/ghostscript @@ -4,7 +4,7 @@ hvconfig_pre() { export GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript" - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} # To use the system-installed version of JasPer: rm -rf jasper diff --git a/stage5/pkg/guitartex b/stage5/pkg/guitartex index 0095323..b9d0bbc 100644 --- a/stage5/pkg/guitartex +++ b/stage5/pkg/guitartex @@ -7,8 +7,6 @@ hvbuild() hvbuild_post() { - cd ${LFS_TMP}/${PACKAGE} - install -v -m755 -d /usr/share/texmf-local/gchords-guitartex install -v -m644 gchords/gchords.sty /usr/share/texmf-local/gchords-guitartex diff --git a/stage5/pkg/i2c-tools b/stage5/pkg/i2c-tools index 7926741..26b846a 100644 --- a/stage5/pkg/i2c-tools +++ b/stage5/pkg/i2c-tools @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - ${HVMAKE} ${HVMAKE} prefix=/usr install } diff --git a/stage5/pkg/lighttpd b/stage5/pkg/lighttpd index 33ab3c7..786de3c 100644 --- a/stage5/pkg/lighttpd +++ b/stage5/pkg/lighttpd @@ -9,8 +9,6 @@ hvconfig_pre() hvbuild_post() { - cd ${LFS_TMP}/${PACKAGE} - install -dv \ /etc/lighttpd \ /var/log/lighttpd \ @@ -18,8 +16,7 @@ hvbuild_post() /var/lib/lighttpd/sockets \ /var/cache/lighttpd - cp -R doc/config/conf.d/ doc/config/*.conf doc/config/vhosts.d/ \ - /etc/lighttpd/ + cp -R ${SRC_DIR}/doc/config/{conf.d/,*.conf,vhosts.d/} /etc/lighttpd/ chown -R www.www \ /etc/lighttpd \ @@ -58,7 +55,7 @@ EOF chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www # Bootscript - cp -p doc/initscripts/sysconfig.lighttpd /etc/sysconfig/lighttpd + cp -p ${SRC_DIR}/doc/initscripts/sysconfig.lighttpd /etc/sysconfig/lighttpd install -v -m740 ${SCRDIR}/bootscripts/lighttpd /etc/rc.d/init.d diff --git a/stage5/pkg/ltsp-utils b/stage5/pkg/ltsp-utils index da7159c..876d7c2 100644 --- a/stage5/pkg/ltsp-utils +++ b/stage5/pkg/ltsp-utils @@ -2,6 +2,5 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} ./install.sh } diff --git a/stage5/pkg/lua b/stage5/pkg/lua index b0cebae..4cc871d 100644 --- a/stage5/pkg/lua +++ b/stage5/pkg/lua @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make linux make INSTALL_TOP=/usr \ TO_LIB="liblua.so liblua.so.5.2 liblua.so.5.2.3" \ diff --git a/stage5/pkg/mercurial b/stage5/pkg/mercurial index 22dbcde..3d3dcdf 100644 --- a/stage5/pkg/mercurial +++ b/stage5/pkg/mercurial @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - make build make PREFIX=/usr install-bin } diff --git a/stage5/pkg/milter-spf b/stage5/pkg/milter-spf index e5de87f..4d3ed7d 100644 --- a/stage5/pkg/milter-spf +++ b/stage5/pkg/milter-spf @@ -2,7 +2,6 @@ hvbuil() { - cd ${LFS_TMP}/${PACKAGE} make make PREFIX=/usr install } diff --git a/stage5/pkg/nss b/stage5/pkg/nss index 4a88ef4..cddbc5e 100644 --- a/stage5/pkg/nss +++ b/stage5/pkg/nss @@ -2,7 +2,7 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE}/nss + cd ${SRC_DIR}/nss # This package does not support parallel build make BUILD_OPT=1 \ @@ -15,7 +15,7 @@ hvbuild() hvbuild_post() { - cd ${LFS_TMP}/${PACKAGE}/dist + cd ${SRC_DIR}/dist install -v -m755 Linux*/lib/*.so /usr/lib install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib diff --git a/stage5/pkg/php b/stage5/pkg/php index 5eded98..083a13f 100644 --- a/stage5/pkg/php +++ b/stage5/pkg/php @@ -49,7 +49,7 @@ hvbuild_post() if [ -f /etc/php.ini ]; then cp /etc/php.ini /etc/php.ini.old fi - cp ${LFS_TMP}/${PACKAGE}/php.ini-production /etc/php.ini + cp ${SRC_DIR}/php.ini-production /etc/php.ini if [ "x${USE_HTTPD}" = "xyes" ]; then # To enable PHP support in the Apache web server, a new AddType diff --git a/stage5/pkg/procmail b/stage5/pkg/procmail index 15a8075..b1f2877 100644 --- a/stage5/pkg/procmail +++ b/stage5/pkg/procmail @@ -2,7 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make \ BASENAME=/usr \ LOCKINGTEST=/tmp \ diff --git a/stage5/pkg/py2cairo b/stage5/pkg/py2cairo index 1404107..e586303 100644 --- a/stage5/pkg/py2cairo +++ b/stage5/pkg/py2cairo @@ -2,9 +2,7 @@ hvconfig() { - cd ${LFS_TMP}/${PACKAGE} - pwd - ls * + cd ${SRC_DIR} ./waf configure \ --prefix=/usr } diff --git a/stage5/pkg/qt b/stage5/pkg/qt index 60319e9..b7d845c 100644 --- a/stage5/pkg/qt +++ b/stage5/pkg/qt @@ -2,7 +2,7 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} + cd ${SRC_DIR} sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \ config.tests/unix/libmng/libmng.cpp diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends index 639fc43..4bcf018 100644 --- a/stage5/pkg/sane-backends +++ b/stage5/pkg/sane-backends @@ -17,7 +17,7 @@ hvconfig_pre() hv_useradd --system -c saned -d /dev/null -g saned -s /bin/false saned # Fixes an obsolete udev parameter: - sed -i 's/SYSFS/ATTRS/g' ${LFS_TMP}/${PACKAGE}/tools/sane-desc.c + sed -i 's/SYSFS/ATTRS/g' ${SRC_DIR}/tools/sane-desc.c CONFIGURE_OPTS+=" --with-x=${USE_X_OPTION}" } diff --git a/stage5/pkg/splix b/stage5/pkg/splix index 52f68b0..1b1731d 100644 --- a/stage5/pkg/splix +++ b/stage5/pkg/splix @@ -4,7 +4,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} make DISABLE_JBIG=1 make install } diff --git a/stage5/pkg/squirrelmail b/stage5/pkg/squirrelmail index c9ea8e9..5fec5ce 100644 --- a/stage5/pkg/squirrelmail +++ b/stage5/pkg/squirrelmail @@ -2,7 +2,7 @@ hvbuild() { - mv ${LFS_TMP}/${PACKAGE} /srv/www/htdocs/squirrelmail + mv ${SRC_DIR} /srv/www/htdocs/squirrelmail chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www/htdocs/squirrelmail mkdir -v -p /srv/squirrelmail/{data,attach} diff --git a/stage5/pkg/stellarium b/stage5/pkg/stellarium index 2a8a083..fb8a733 100644 --- a/stage5/pkg/stellarium +++ b/stage5/pkg/stellarium @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - mkdir -p builds/unix cd builds/unix diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive index 17b83e8..b5cbd59 100644 --- a/stage5/pkg/texlive +++ b/stage5/pkg/texlive @@ -15,7 +15,7 @@ hvconfig_pre() sed -i -e 's|PARENT/\.\./texmf-local|PARENT/texmf-local|' \ -e 's|\$TEXMFVAR/fonts|/var/lib/livetex/fonts|' \ - ${LFS_TMP}/${PACKAGE}/texk/kpathsea/texmf.cnf + ${SRC_DIR}/texk/kpathsea/texmf.cnf CONFIGURE_OPTS+=" \ --disable-native-texlive-build \ @@ -33,7 +33,8 @@ hvconfig_pre() hvbuild_post() { - cp -a ${LFS_TMP}/${PACKAGE}/utils/biber/TeXLive /usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL}) + cp -a ${SRC_DIR}/utils/biber/TeXLive \ + /usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL}) rm -v /usr/texmf{,-dist} install -v -m1777 -d /var/lib/livetex/fonts diff --git a/stage5/pkg/uw-imap b/stage5/pkg/uw-imap index 37eee8a..acaaad5 100644 --- a/stage5/pkg/uw-imap +++ b/stage5/pkg/uw-imap @@ -2,8 +2,6 @@ hvbuild() { - cd ${LFS_TMP}/${PACKAGE} - # Setting default mailbox format for imapd sed -i -e "s!^\(CREATEPROTO=\)unixproto!\1${MAILBOX_FORMAT}proto!" \ src/osdep/unix/Makefile @@ -27,7 +25,10 @@ hvbuild() ln -sf /usr/lib/uw-imap/lib/c-client.a /usr/lib/uw-imap/lib/libc-client.a install -v -m 644 c-client/*.h /usr/lib/uw-imap/include install -v -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include +} +hvbuild_post() +{ # Addition to xinetd cat > /etc/xinetd.d/imapd << "EOF" service imap diff --git a/stage5/pkg/vobcopy b/stage5/pkg/vobcopy index e6269aa..290eacc 100644 --- a/stage5/pkg/vobcopy +++ b/stage5/pkg/vobcopy @@ -2,6 +2,5 @@ hvconfig_pre() { - cd ${LFS_TMP}/${PACKAGE} - mv configure.sh configure + mv ${SRC_DIR}/configure{.sh,} } diff --git a/stage5/pkg/xsane b/stage5/pkg/xsane index 4e1db05..9356fed 100644 --- a/stage5/pkg/xsane +++ b/stage5/pkg/xsane @@ -2,7 +2,8 @@ hvconfig_pre() { - sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' ${LFS_TMP}/${PACKAGE}/src/xsane-save.c + sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' \ + ${SRC_DIR}/src/xsane-save.c } hvbuild_post()