Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (115d58a6a02b35912d181ec24621e50b562da2fe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (115d58a6a02b35912d181ec24621e50b562da2fe)
  • Date: Thu, 10 Aug 2017 19:56:13 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

libs/ncurses/FINAL | 3 ---
libs/ncurses/HISTORY | 4 ++++
libs/ncurses/INSTALL | 39 ---------------------------------------
libs/ncurses/protected | 1 -
4 files changed, 4 insertions(+), 43 deletions(-)

New commits:
commit 86a0ffa09d338017a80393c98d0004081c285ff7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

ncurses: remove outdated manual staging

The temporary staging of libraries is taken care of by sorcery already,
no need to do it manually in the spell. Besides it messes with the idea
of library preservation.

diff --git a/libs/ncurses/FINAL b/libs/ncurses/FINAL
deleted file mode 100755
index e6225bf..0000000
--- a/libs/ncurses/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-message "removing stale files..." &&
-
-rm -rf "$TMPSTAGING"
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 119602a..5c3c87c 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2017-08-10 Remko van der Vossen <wich AT sourcemage.org>
+ * INSTALL, FINAL, protected, REPAIR^all^protected:
+ remove outdated manual staging
+
2017-08-05 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS, POST_INSTALL, PRE_BUILD,
ncurses-5.9-gcc5_buildfixes-1.patch: updated to 6.0
diff --git a/libs/ncurses/INSTALL b/libs/ncurses/INSTALL
index bb4f22e..110798e 100755
--- a/libs/ncurses/INSTALL
+++ b/libs/ncurses/INSTALL
@@ -12,51 +12,12 @@ function fixlinks() { # $1 = install root
make_normal &&

# setup staging
-persistent_add TMPSTAGING &&
-local TMPSTAGING=/tmp/sorcery/ncurses.$$ &&
-mkdir -p $TMPSTAGING/lib &&
MVERSION=${VERSION/.*/} &&

-# install libs to staging
-make install.libs DESTDIR="$TMPSTAGING" &&
-{ # setting these off to the side -- they are protected as well
- cp $INSTALL_ROOT/lib/lib*curses* $TMPSTAGING/lib/; true; # but we don't
care if there is nothing there (e.g. chroot install)
-} && ldconfig && ldconfig $TMPSTAGING/lib &&
-fixlinks $TMPSTAGING &&
-ldconfig && ldconfig $TMPSTAGING/lib &&
-
# install to real install root
make install.libs DESTDIR="$INSTALL_ROOT" &&
fixlinks $INSTALL_ROOT &&

-# get rid of the old version of libncurses.so (otherwise tic will complain
during 5.4 -> 5.5)
-{
-mv $INSTALL_ROOT/lib/libncurses.so.$VERSION \
- $INSTALL_ROOT/lib/libncurses.so-bak.$VERSION &&
-mv $INSTALL_ROOT/lib/libncurses.so.$MVERSION \
- $INSTALL_ROOT/lib/libncurses.so-bak.$MVERSION &&
-{ rm $INSTALL_ROOT/lib/libncurses.so.* ; true; } && # we might not be using
an old version
-mv $INSTALL_ROOT/lib/libncurses.so-bak.$VERSION \
- $INSTALL_ROOT/lib/libncurses.so.$VERSION &&
-mv $INSTALL_ROOT/lib/libncurses.so-bak.$MVERSION \
- $INSTALL_ROOT/lib/libncurses.so.$MVERSION &&
-ldconfig; true # but we don't care if there is nothing there (chroot install)
-} &&
-
-# get rid of the old version of libncursesw.so Bug #13408
-{
-mv $INSTALL_ROOT/lib/libncursesw.so.$VERSION \
- $INSTALL_ROOT/lib/libncursesw.so-bak.$VERSION &&
-mv $INSTALL_ROOT/lib/libncursesw.so.$MVERSION \
- $INSTALL_ROOT/lib/libncursesw.so-bak.$MVERSION &&
-{ rm $INSTALL_ROOT/lib/libncursesw.so.* ; true; } && # we might not be using
an old version
-mv $INSTALL_ROOT/lib/libncursesw.so-bak.$VERSION \
- $INSTALL_ROOT/lib/libncursesw.so.$VERSION &&
-mv $INSTALL_ROOT/lib/libncursesw.so-bak.$MVERSION \
- $INSTALL_ROOT/lib/libncursesw.so.$MVERSION &&
-ldconfig; true # but we don't care if there is nothing there (chroot install)
-} &&
-
# Do not install the libs again. Causes problems. Bug #13408

sedit 's/cd ncurses /# cd ncurses /' Makefile &&
diff --git a/libs/ncurses/REPAIR^all^protected
b/libs/ncurses/REPAIR^all^protected
new file mode 100644
index 0000000..e69de29
diff --git a/libs/ncurses/protected b/libs/ncurses/protected
index 68b2849..e69de29 100644
--- a/libs/ncurses/protected
+++ b/libs/ncurses/protected
@@ -1 +0,0 @@
-^/lib/libncurses



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (115d58a6a02b35912d181ec24621e50b562da2fe), Remko van der Vossen, 08/10/2017

Archive powered by MHonArc 2.6.24.

Top of Page