Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c627167204b314be1bea6fb06195a7c104b14a9a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c627167204b314be1bea6fb06195a7c104b14a9a)
  • Date: Wed, 9 Jan 2019 10:47:50 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/acl/DETAILS | 2 --
disk/acl/HISTORY | 5 +++++
disk/acl/INSTALL | 14 --------------
disk/acl/PRE_INSTALL | 11 ++++-------
libs/ncurses/BUILD | 4 +---
libs/ncurses/DEPENDS | 1 -
libs/ncurses/DETAILS | 1 -
libs/ncurses/HISTORY | 6 ++++++
libs/ncurses/PRE_INSTALL | 4 ++++
9 files changed, 20 insertions(+), 28 deletions(-)

New commits:
commit c627167204b314be1bea6fb06195a7c104b14a9a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

acl - re-enable staging

commit e239b7b48ce1257977b95f7a38e3a43740189417
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ncurses - re-enable staging

diff --git a/disk/acl/DETAILS b/disk/acl/DETAILS
index e306444..6121819 100755
--- a/disk/acl/DETAILS
+++ b/disk/acl/DETAILS
@@ -5,10 +5,8 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://mirror.lihnidos.org/GNU/savannah/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_GPG=acl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- STAGED_INSTALL=off
LICENSE[0]=GPL
KEYWORDS="disk"
WEB_SITE=https://oss.sgi.com/projects/xfs/
diff --git a/disk/acl/HISTORY b/disk/acl/HISTORY
index 0fcb686..b6059d3 100644
--- a/disk/acl/HISTORY
+++ b/disk/acl/HISTORY
@@ -1,3 +1,8 @@
+2019-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_INSTALLL: use protect_special_libs
+ * INSTALL: deleted
+ * DETAILS: re-enable staging
+
2018-09-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.53
* acl.gpg: add Mike Frysinger <vapier AT gentoo.org>
diff --git a/disk/acl/INSTALL b/disk/acl/INSTALL
deleted file mode 100644
index c493748..0000000
--- a/disk/acl/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# setup staging
-local TMPSTAGING="/tmp/sorcery/libacl.$$" &&
-mkdir -p "$TMPSTAGING/lib" &&
-
-# install libs to staging
-cp "$SOURCE_DIRECTORY/libacl/.libs"/libacl.so* "$TMPSTAGING/lib" &&
-ldconfig && ldconfig "$TMPSTAGING/lib" &&
-
-# install normally
-make install install-dev install-lib &&
-
-# return the libs to normal
-ldconfig &&
-rm -rf "/tmp/sorcery/libacl.$$"
diff --git a/disk/acl/PRE_INSTALL b/disk/acl/PRE_INSTALL
index 046830b..5a89fc8 100755
--- a/disk/acl/PRE_INSTALL
+++ b/disk/acl/PRE_INSTALL
@@ -1,7 +1,4 @@
-cd $SOURCE_DIRECTORY &&
-if spell_ok $SPELL; then
- mkdir old.libs &&
- cp -a /lib/libacl.* old.libs &&
- ldconfig $SOURCE_DIRECTORY/old.libs &&
- dispel --notriggers --nosustain $SPELL
-fi
+source $GRIMOIRE/protect_special_libs
+
+protect_special_libs
+do_dispel
diff --git a/libs/ncurses/BUILD b/libs/ncurses/BUILD
index 999ae3a..9daa3c4 100755
--- a/libs/ncurses/BUILD
+++ b/libs/ncurses/BUILD
@@ -11,6 +11,4 @@ OPTS="$OPTS --with-shared --libdir=${TRACK_ROOT}/lib
--enable-pc-files" &&
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
- make DESTDIR=$INSTALL_ROOT &&
-
-export LD_LIBRARY_PATH="${SOURCE_DIRECTORY}/lib:${LD_LIBRARY_PATH}"
+ make DESTDIR=$INSTALL_ROOT
diff --git a/libs/ncurses/DEPENDS b/libs/ncurses/DEPENDS
index 1f21b1e..af4c3c9 100755
--- a/libs/ncurses/DEPENDS
+++ b/libs/ncurses/DEPENDS
@@ -1,4 +1,3 @@
-depends gnupg &&
depends smgl-fhs &&
depends pkgconfig '--with-pkgconfig --enable-pc-files' &&

diff --git a/libs/ncurses/DETAILS b/libs/ncurses/DETAILS
index 3df7310..32154a0 100755
--- a/libs/ncurses/DETAILS
+++ b/libs/ncurses/DETAILS
@@ -1,7 +1,6 @@
SPELL=ncurses
VERSION=6.1
PATCHLEVEL=2
- STAGED_INSTALL=off
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 758725a..ac7f0ae 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,9 @@
+2010-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: re-enable staging
+ * PRE_INSTALL: added
+ * DEPENDS: delete gnupg
+ * BUILD: remove unneeded LD_LIBRARY_PATH
+
2018-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: disable staging to work around segfault during install

diff --git a/libs/ncurses/PRE_INSTALL b/libs/ncurses/PRE_INSTALL
new file mode 100755
index 0000000..5a89fc8
--- /dev/null
+++ b/libs/ncurses/PRE_INSTALL
@@ -0,0 +1,4 @@
+source $GRIMOIRE/protect_special_libs
+
+protect_special_libs
+do_dispel



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c627167204b314be1bea6fb06195a7c104b14a9a), Treeve Jelbert, 01/09/2019

Archive powered by MHonArc 2.6.24.

Top of Page