чување eba41591ef21f57c6960c90504a46b87521776c2
родитељ a550ed6e3ecb5968f670a706aa611bb6e7531c20
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Wed, 24 Aug 2022 17:13:39 +0200
Build both static and dynamic pcre{,2}; move them before git
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
| M | 03-packages.sh | | | 203 | ++++++++++++++++++++++++++++++++++++++++--------------------------------------- |
измењених датотека: 1, додавања: 103(+), брисања: 100(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -2478,10 +2478,11 @@ mkpk_install()
DESTDIR=/build
export CFLAGS LDFLAGS DESTDIR
- ./configure --prefix=/sucks \
- --disable-static \
- --includedir=/sucks/include \
- --disable-multi-os-directory \
+ ./configure --prefix=/sucks \\
+ --enable-shared \\
+ --enable-static \\
+ --includedir=/sucks/include \\
+ --disable-multi-os-directory \\
--with-pic
make ${JN} || exit 1
@@ -3563,6 +3564,103 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" dosfstools 4.2 "${timestamp}" >>${G_PKGDB}
end_substep
+begin_substep pcre-8.45
+if [ -x /sucks/lib/libpcre.so ]; then
+ msg info "%s exists, skipping %s" /sucks/lib/libpcre.so ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.bz2
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-Os -pipe'
+ LDFLAGS=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/sucks \\
+ --docdir=/sucks/share/doc/${pkg} \\
+ --enable-static \\
+ --enable-shared \\
+ --enable-unicode-properties \\
+ --enable-pcre16 \\
+ --enable-pcre32 \\
+ --enable-pcregrep-libz \\
+ --enable-pcregrep-libbz2 \\
+ --enable-pcretest-libreadline \\
+ --enable-jit
+
+ make ${JN} || exit 1
+ make install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" pcre 8.45 "${timestamp}" >>${G_PKGDB}
+end_substep
+
+begin_substep pcre2-10.39
+if [ -x /sucks/lib/libpcre2-32.so.0.10.4 ]; then
+ msg info "%s exists, skipping %s" /sucks/lib/libpcre2-32.so.0.10.4 \
+ ${pkg}
+elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
+ unpack_pkg ${pkg} /
+else
+ extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.bz2
+ (
+ cd_or_fail ${G_SRC}/${pkg}
+
+ cat <<! >MKPK
+mkpk_name()
+{
+ printf "%s" "${pkg}"
+}
+
+mkpk_install()
+{
+ CFLAGS='-Os -pipe'
+ LDFLAGS=''
+ DESTDIR=/build
+ export CFLAGS LDFLAGS DESTDIR
+
+ ./configure --prefix=/sucks \\
+ --docdir=/sucks/share/doc/${pkg} \\
+ --enable-static \\
+ --enable-shared \\
+ --enable-unicode \\
+ --enable-pcre2-16 \\
+ --enable-pcre2-32 \\
+ --enable-pcre2grep-libz \\
+ --enable-pcre2grep-libbz2 \\
+ --enable-pcre2test-libreadline \\
+ --enable-jit
+
+ make ${JN} || exit 1
+ make install
+}
+!
+ mkpk ${pkg}
+ remove_dir ${G_SRC}/${pkg}
+ unpack_pkg ${pkg} /
+ ) || exit 1
+fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" pcre2 10.39 "${timestamp}" >>${G_PKGDB}
+end_substep
+
begin_substep git-2.37.1
if [ -x /sucks/bin/git ]; then
msg info "%s exists, skipping %s" /sucks/bin/git ${pkg}
@@ -3582,7 +3680,7 @@ mkpk_name()
mkpk_install()
{
CFLAGS='-Os -pipe'
- LDFLAGS='-s'
+ LDFLAGS=''
DESTDIR=/build
TAR=/tools/bin/tar
export CFLAGS LDFLAGS DESTDIR TAR
@@ -3847,101 +3945,6 @@ timestamp=$(date +'%Y-%m-%d %T')
printf "%s\t%s\t%s\n" patch 2.7.6 "${timestamp}" >>${G_PKGDB}
end_substep
-begin_substep pcre-8.45
-if [ -x /sucks/lib/libpcre.so ]; then
- msg info "%s exists, skipping %s" /sucks/lib/libpcre.so ${pkg}
-elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
- unpack_pkg ${pkg} /
-else
- extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.bz2
- (
- cd_or_fail ${G_SRC}/${pkg}
-
- cat <<! >MKPK
-mkpk_name()
-{
- printf "%s" "${pkg}"
-}
-
-mkpk_install()
-{
- CFLAGS='-Os -pipe'
- LDFLAGS=''
- DESTDIR=/build
- export CFLAGS LDFLAGS DESTDIR
-
- ./configure --prefix=/sucks \\
- --docdir=/sucks/share/doc/${pkg} \\
- --enable-unicode-properties \\
- --enable-pcre16 \\
- --enable-pcre32 \\
- --enable-pcregrep-libz \\
- --enable-pcregrep-libbz2 \\
- --enable-pcretest-libreadline \\
- --disable-static \\
- --enable-jit
-
- make ${JN} || exit 1
- make install
-}
-!
- mkpk ${pkg}
- remove_dir ${G_SRC}/${pkg}
- unpack_pkg ${pkg} /
- ) || exit 1
-fi
-timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" pcre 8.45 "${timestamp}" >>${G_PKGDB}
-end_substep
-
-begin_substep pcre2-10.39
-if [ -x /sucks/lib/libpcre2-32.so.0.10.4 ]; then
- msg info "%s exists, skipping %s" /sucks/lib/libpcre2-32.so.0.10.4 \
- ${pkg}
-elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
- unpack_pkg ${pkg} /
-else
- extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.bz2
- (
- cd_or_fail ${G_SRC}/${pkg}
-
- cat <<! >MKPK
-mkpk_name()
-{
- printf "%s" "${pkg}"
-}
-
-mkpk_install()
-{
- CFLAGS='-Os -pipe'
- LDFLAGS=''
- DESTDIR=/build
- export CFLAGS LDFLAGS DESTDIR
-
- ./configure --prefix=/sucks \\
- --docdir=/sucks/share/doc/${pkg} \\
- --enable-unicode \\
- --enable-pcre2-16 \\
- --enable-pcre2-32 \\
- --enable-pcre2grep-libz \\
- --enable-pcre2grep-libbz2 \\
- --enable-pcre2test-libreadline \\
- --disable-static \\
- --enable-jit
-
- make ${JN} || exit 1
- make install
-}
-!
- mkpk ${pkg}
- remove_dir ${G_SRC}/${pkg}
- unpack_pkg ${pkg} /
- ) || exit 1
-fi
-timestamp=$(date +'%Y-%m-%d %T')
-printf "%s\t%s\t%s\n" pcre2 10.39 "${timestamp}" >>${G_PKGDB}
-end_substep
-
begin_substep metalog-20220214
if [ -x /sucks/sbin/metalog ]; then
msg info "%s exists, skipping %s" /sucks/sbin/metalog ${pkg}
