Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ec6b9ca944f53f1a4d757e4f4cd1e9c71c959e5d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ec6b9ca944f53f1a4d757e4f4cd1e9c71c959e5d)
  • Date: Wed, 21 Aug 2019 19:20:41 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

archive-libs/lzo/BUILD | 2 +-
archive-libs/lzo/DETAILS | 1 +
archive-libs/lzo/HISTORY | 4 ++++
archive-libs/lzo/INSTALL | 2 ++
archive/xz-utils/BUILD | 2 +-
archive/xz-utils/DETAILS | 1 +
archive/xz-utils/HISTORY | 4 ++++
archive/xz-utils/INSTALL | 2 ++
devel/ghc/BUILD | 14 +++++++++++++-
devel/ghc/DETAILS | 27 ++++++++++++++++++---------
devel/ghc/HISTORY | 4 ++++
devel/ghc/PRE_BUILD | 4 ++--
devel/ninja-build-system/BUILD | 7 ++++++-
devel/ninja-build-system/HISTORY | 3 +++
doc/xpdf/BUILD | 7 +++++++
doc/xpdf/HISTORY | 3 +++
16 files changed, 72 insertions(+), 15 deletions(-)

New commits:
commit ec6b9ca944f53f1a4d757e4f4cd1e9c71c959e5d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lzo: Disable libtool archive and static lib, PATCHLEVEL++

commit aff662aadc539e101e79d0023f107e14bff6d459
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xz-utils: Disable libtool archive and static lib, PATCHLEVEL++

commit b62d92cdd80b6dcb0c12239dac7e30a04d5fd644
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ninja-build-system: Fix launching of configure.py

Launch it explicitly with the right interpreter, to allow for python3
and to prevent inconsistencies.

commit 4ecbf489a578663e5c542baa14c299e8bbbc5c82
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ghc: Fix building with -Wl,-z{,no}separate-code

commit 5e44033f027b209cb73cbcb235a6f90b714ef2fa
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ghc: Fix bootstrapping on musl

commit 00000f9757b60c734b68fc2c6444ce5a0adfa22b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xpdf: Fix building of the UI

Qt5 utilities need to be in PATH for CMake to find it.

Also, add RPATH.

diff --git a/archive-libs/lzo/BUILD b/archive-libs/lzo/BUILD
index 881b4c1..467d464 100755
--- a/archive-libs/lzo/BUILD
+++ b/archive-libs/lzo/BUILD
@@ -1,3 +1,3 @@
-OPTS="--libdir=/lib --enable-shared $OPTS" &&
+OPTS="--libdir=/lib --disable-static --enable-shared $OPTS" &&

default_build
diff --git a/archive-libs/lzo/DETAILS b/archive-libs/lzo/DETAILS
index 8e3424e..adcbba6 100755
--- a/archive-libs/lzo/DETAILS
+++ b/archive-libs/lzo/DETAILS
@@ -1,5 +1,6 @@
SPELL=lzo
VERSION=2.10
+ PATCHLEVEL=1
SECURITY_PATCH=1
SOURCE_HASH=sha1:4924676a9bae5db58ef129dc1cebce3baa3c4b5d:UPSTREAM_HASH
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/archive-libs/lzo/HISTORY b/archive-libs/lzo/HISTORY
index 2b17cd8..89f30e1 100644
--- a/archive-libs/lzo/HISTORY
+++ b/archive-libs/lzo/HISTORY
@@ -1,3 +1,7 @@
+2019-08-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Disabled static lib and libtool archive
+ * DETAILS: PATCHLEVEL++
+
2017-03-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.10, switched to UPSTREAM_HASH

diff --git a/archive-libs/lzo/INSTALL b/archive-libs/lzo/INSTALL
new file mode 100755
index 0000000..8f7ad76
--- /dev/null
+++ b/archive-libs/lzo/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+rm -f "$INSTALL_ROOT"/lib/liblzo2.la
diff --git a/archive/xz-utils/BUILD b/archive/xz-utils/BUILD
index 01d506a..acaf104 100755
--- a/archive/xz-utils/BUILD
+++ b/archive/xz-utils/BUILD
@@ -1,3 +1,3 @@
-OPTS+=" --exec-prefix=${INSTALL_ROOT}" &&
+OPTS+=" --disable-static --exec-prefix=${INSTALL_ROOT}" &&

default_build
diff --git a/archive/xz-utils/DETAILS b/archive/xz-utils/DETAILS
index b3b3a25..26116b7 100755
--- a/archive/xz-utils/DETAILS
+++ b/archive/xz-utils/DETAILS
@@ -1,5 +1,6 @@
SPELL=xz-utils
VERSION=5.2.4
+ PATCHLEVEL=1
SOURCE=xz-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/xz-$VERSION"
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index fc055cb..d5020d5 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,7 @@
+2019-08-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Removed static library and .la file
+ * DETAILS: PATCHLEVEL++
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/archive/xz-utils/INSTALL b/archive/xz-utils/INSTALL
new file mode 100755
index 0000000..2e18151
--- /dev/null
+++ b/archive/xz-utils/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+rm -f "$INSTALL_ROOT"/lib/liblzma.la
diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index 1c0d08f..9b157f2 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -10,7 +10,19 @@ if [[ -x ${INSTALL_ROOT}/usr/bin/ghc-pkg-7.2.1 ]]; then
ghc-pkg-7.2.1 trust base
fi &&

-if [[ $SOURCE2 != "" ]] ; then
+# ld.gold and ld.lld are chosen first, but don't support -z{,no}separate-code
+if type ld.gold || type ld.lld; then
+ case "$LD" in
+ ld|ld.bfd)
+ ;;
+ *)
+ LDFLAGS="${LDFLAGS//-Wl,-znoseparate-code}"
+ LDFLAGS="${LDFLAGS//-Wl,-zseparate-code}"
+ ;;
+ esac
+fi > /dev/null
+
+if ! spell_ok "$SPELL"; then
cd ghc-bin &&
./configure --prefix=${SOURCE_DIRECTORY}/ghc-bin-installed &&
if [ "$(uname -m)" == x86_64 ]; then
diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index ff0f268..64d10d0 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -4,17 +4,26 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.haskell.org/~$SPELL/$VERSION/$SOURCE

SOURCE_HASH=sha512:c08a7480200cb99e1ffbe4ce7669f552b1054054966f7e7efcbc5f98af8032e1249fa391c4fc4c7d62cc8e0be5d17fa05845177f3cea3dbcf86e6c92d40fc0f9
- ARCH="$(uname -m)"
- if [[ "$ARCH" = i686 ]]; then
- ARCH=i386
- fi
- SOURCE2=${SPELL}-${VERSION}-${ARCH}-deb9-linux.tar.xz
- SOURCE2_URL[0]=http://downloads.haskell.org/~${SPELL}/${VERSION}/${SOURCE2}
- if [ "$ARCH" = "x86_64" ]; then
+if ! spell_ok "$SPELL"; then
+ ARCH="${BUILD%%-*}"; case "$ARCH" in i?86) ARCH=i386;; esac
+case "$BUILD" in
+*-linux-gnu)
+ SOURCE2="$SPELL-$VERSION-$ARCH-deb9-linux.tar.xz"
+ SOURCE2_URL=("http://downloads.haskell.org/~$SPELL/$VERSION/$SOURCE2";)
+ ;&
+x86_64-*-linux-gnu)

SOURCE2_HASH=sha512:6e1d17ea69d313d7023985759ac28c87b620ea6fac59b92f298467e0b8a501ca6a9ba6e0107d6b27d3976be1da724e7e8b1625e7b99be4045f319a916d0ab711
- fi
+ ;;
+*-linux-musl)
+ SOURCE2="$SPELL-$VERSION-$ARCH-void-linux-musl.tar.xz"
+ SOURCE2_URL=("https://alpha.de.repo.voidlinux.org/distfiles/$SOURCE2";)
+ ;&
+x86_64-*-linux-musl)
+
SOURCE2_HASH=sha512:5a9d2832ef5fe581316c2d858548a0b41592dd1b596ffe68ef9bf49e94b428d2771cf6b2c876f57e46893171d46f48c367ac13d75d9dde28072233d5f18dd96e
+ ;;
+esac
+fi
TMPFS=off
-
LICENSE[0]=BSD
WEB_SITE=http://www.haskell.org/ghc/
ENTERED=20041221
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 0d5c6fe..f7b4310 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,7 @@
+2019-08-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, PRE_BUILD: Fixed boostrapping on musl
+ * BUILD: Fixed building with -Wl,-z{,no}separate-code
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index c6ff5af..0678403 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -9,9 +9,9 @@ fi &&
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&

-if [[ $SOURCE2 != "" ]] ; then
+if ! spell_ok "$SPELL"; then
unpack_file 2 &&
- mv $SPELL-$VERSION ghc-bin
+ mv "$SPELL-$VERSION" ghc-bin
fi &&

unpack_file &&
diff --git a/devel/ninja-build-system/BUILD b/devel/ninja-build-system/BUILD
index aed5184..b829de4 100755
--- a/devel/ninja-build-system/BUILD
+++ b/devel/ninja-build-system/BUILD
@@ -1 +1,6 @@
-./configure.py --bootstrap
+if is_depends_enabled "$SPELL" python3; then
+ py=python3
+else
+ py=python2
+fi &&
+"$py" configure.py --bootstrap
diff --git a/devel/ninja-build-system/HISTORY
b/devel/ninja-build-system/HISTORY
index b46a7c2..3fac700 100644
--- a/devel/ninja-build-system/HISTORY
+++ b/devel/ninja-build-system/HISTORY
@@ -1,3 +1,6 @@
+2019-08-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fixed launching of the configure.py script
+
2019-08-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new website

diff --git a/doc/xpdf/BUILD b/doc/xpdf/BUILD
index 7d8cad8..f10842a 100755
--- a/doc/xpdf/BUILD
+++ b/doc/xpdf/BUILD
@@ -1,3 +1,10 @@
OPTS+=" -DMULTITHREADED=ON ${A4_PAPER}" &&

+if is_depends_enabled "$SPELL" qtbase; then
+ # To enable finding Qt5
+ PATH="$QT5DIR/bin:$PATH" &&
+ # RPATH isn't being added by CMake
+ LDFLAGS="$LDFLAGS -Wl,-rpath=$QT5DIR/lib"
+fi &&
+
default_build
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index f5dab87..1200b39 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,6 @@
+2019-08-21 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fixed building of the UI
+
2019-03-15 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.01.01




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ec6b9ca944f53f1a4d757e4f4cd1e9c71c959e5d), Ismael Luceno, 08/21/2019

Archive powered by MHonArc 2.6.24.

Top of Page