mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-08-09 12:40:29 +02:00
master merged
This commit is contained in:
+2
-2
@@ -14,12 +14,12 @@ pbuild::configure() {
|
||||
esac
|
||||
"${srcdir}"/configure \
|
||||
--prefix="${PREFIX}" \
|
||||
--bindir="${PREFIX}/sbin" \
|
||||
--bindir="${PREFIX}/${UTILBIN_DIR}" \
|
||||
--enable-shared=no \
|
||||
|| exit 1
|
||||
}
|
||||
|
||||
pbuild::post_install() {
|
||||
{ cd "${PREFIX}"/sbin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
|
||||
{ cd "${PREFIX}/${UTILBIN_DIR}" && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env modbuild
|
||||
|
||||
pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/sbin"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/${UTILBIN_DIR}"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env modbuild
|
||||
|
||||
pbuild::set_download_url "http://ftp.gnu.org/gnu/coreutils/$P-$V.tar.xz"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/sbin"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/${UTILBIN_DIR}"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env modbuild
|
||||
|
||||
pbuild::set_download_url "https://ftp.gnu.org/pub/gnu/$P/$P-$V.tar.xz"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/sbin"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/${UTILBIN_DIR}"
|
||||
|
||||
+15
-7
@@ -17,22 +17,30 @@ pbuild::compile() {
|
||||
declare -x LIBRARY_PATH="${PREFIX}/lib"
|
||||
case ${OS} in
|
||||
Linux )
|
||||
declare -x C_INCLUDE_PATH="${PREFIX}/include"
|
||||
declare -x LIBRARY_PATH="${PREFIX}/lib"
|
||||
declare -x LDFLAGS="-lintl -L${PREFIX}/lib"
|
||||
;;
|
||||
Darwin )
|
||||
declare -x LDFLAGS="-lintl -liconv -framework CoreFoundation"
|
||||
if [[ ! -d '/opt/local/bin' ]] || [[ ! -x '/opt/local/bin/msgfmt' ]]; then
|
||||
std::die 1 "gettext port from Macports is required to build 'getopt'!"
|
||||
fi
|
||||
PATH+=':/opt/local/bin'
|
||||
declare -x C_INCLUDE_PATH='/opt/local/include'
|
||||
declare -x LDFLAGS="/opt/local/lib/libintl.a /opt/local/lib/libiconv.a -framework CoreFoundation"
|
||||
;;
|
||||
esac
|
||||
|
||||
make -e all
|
||||
make -e all || exit 1
|
||||
declare -x DESTDIR="${PREFIX}"
|
||||
declare -x prefix='' || exit 1
|
||||
PATH="${PREFIX}/${UTILBIN_DIR}:${PATH}"
|
||||
make -e install
|
||||
mv "${PREFIX}/bin/getopt" "${PREFIX}/${UTILBIN_DIR}"
|
||||
}
|
||||
|
||||
pbuild::install() {
|
||||
declare -x DESTDIR="${PREFIX}"
|
||||
declare -x prefix=''
|
||||
make -e install
|
||||
mkdir -p "${PREFIX}/sbin"
|
||||
mv "${PREFIX}/bin/getopt" "${PREFIX}/sbin"
|
||||
:
|
||||
}
|
||||
|
||||
pbuild::cleanup_build() {
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
pbuild::set_download_url "https://ftp.gnu.org/pub/gnu/$P/$P-$V.tar.gz"
|
||||
|
||||
pbuild::add_configure_args "--prefix=${PREFIX}"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/sbin"
|
||||
pbuild::add_configure_args "--bindir=${PREFIX}/${UTILBIN_DIR}"
|
||||
pbuild::add_configure_args "--disable-java"
|
||||
pbuild::add_configure_args "--disable-threads"
|
||||
pbuild::add_configure_args "--disable-shared"
|
||||
|
||||
+13
-12
@@ -29,18 +29,19 @@ pbuild::configure() {
|
||||
}
|
||||
|
||||
pbuild::post_install() {
|
||||
rm -v ${PREFIX}/Modules/bin/add.modules
|
||||
rm -v ${PREFIX}/Modules/bin/mkroot
|
||||
rm -rfv ${PREFIX}/Modules/modulefiles
|
||||
mv -v ${PREFIX}/Modules/share/man/man1/module.1 ${PREFIX}/share/man/man1
|
||||
mv -v ${PREFIX}/Modules/share/man/man4/modulefile.4 ${PREFIX}/share/man/man4
|
||||
rmdir ${PREFIX}/Modules/bin
|
||||
rmdir ${PREFIX}/Modules/share/man/man1
|
||||
rmdir ${PREFIX}/Modules/share/man/man4
|
||||
rmdir ${PREFIX}/Modules/share/man
|
||||
rmdir ${PREFIX}/Modules/share
|
||||
rmdir ${PREFIX}/Modules
|
||||
cp -v "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1
|
||||
rm -v "${PREFIX}/Modules/bin/add.modules"
|
||||
rm -v "${PREFIX}/Modules/bin/mkroot"
|
||||
rm -rfv "${PREFIX}/Modules/modulefiles"
|
||||
mv -v "${PREFIX}/Modules/share/man/man1/module.1 ${PREFIX}/share/man/man1"
|
||||
mv -v "${PREFIX}/Modules/share/man/man4/modulefile.4 ${PREFIX}/share/man/man4"
|
||||
rmdir "${PREFIX}/Modules/bin"
|
||||
rmdir "${PREFIX}/Modules/share/man/man1"
|
||||
rmdir "${PREFIX}/Modules/share/man/man4"
|
||||
rmdir "${PREFIX}/Modules/share/man"
|
||||
rmdir "${PREFIX}/Modules/share"
|
||||
rmdir "${PREFIX}/Modules"
|
||||
rm -f "${PREIX}/init/{ksh,perl.pm,python.py,ruby.rb,cmake,.modulespath}"
|
||||
cp -v "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1
|
||||
}
|
||||
|
||||
# fake module command
|
||||
|
||||
Reference in New Issue
Block a user