New commits:
commit 38cc2e11b8bd26a26d93a1b1643902262197952a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mpfr - should be in /lib
commit 7d565bc2767cbc92b4150d233c172b5d31301d45
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
protect_special_libs - tweak
commit f686a6d1c63365006bb24355be78a78e51d45521
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
glibc - staging now works
commit 310c524201f56d0ca9c30395e1fb4ee002616f99
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
glibc - delete dead code
commit 62f6ece09962e47b6f748a05e388febd0d3915e1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
glibc - fix build on some systems
commit 5139f32120fa02030573963c9284ad0b40fb0fbf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
vulkan-loader: => 1.1.101
commit 42d96b0a866f26e9bb7f41baf9af511b37e46ed3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
vulkan-headers: => 1.1.101
commit 77f75c49c7beffd1c3e30d2ae9a6d028272e58db
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
vulkan-tools: => 1.1.100
diff --git a/ChangeLog b/ChangeLog
index 89792fb..2c35fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-02-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * protect_special_libs: tweak
+
2019-02-22 Pavel Vinogradov <public AT sourcemage.org>
* kernel.gpg: added new key, E4B71D5EEC39C284,
Karel Zak <kzak AT redhat.com>
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 0d18489..36ce673 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,49 +1,10 @@
-# Following flags make the build fail
-for flag in \
- -flto \
- -Wunsafe-loop-optimizations
-do
- LDFLAGS="${LDFLAGS/$flag}" &&
- CFLAGS="${CFLAGS/$flag}"
-done &&
+# clear all cflags
+export CFLAGS=''
if [[ $GLIBC_DEBUG == "y" ]]; then
LDFLAGS="${LDFLAGS/-s/}"
fi &&
-# install x86_64 linker to lib instead of lib64
-sedit "s/lib64/lib/" sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
-sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed &&
-
-#
-# bug#5570 ccache sometimes has trouble correctly recognising minor
differences
-# in configurations and doesn't force recompile when it should. This stops
it from
-# using the old cache entries.
-#
-export CCACHE_RECACHE=true &&
-#
-# End ccache fix
-#
-
-local ADDONS
- #
- # Enable IDN?
- #
- if [ "$GLIBC_USEIDN" = "y" ]; then
- ADDONS="$ADDONS libidn"
- fi &&
-
- OPTS="$OPTS --with-tls \
- --enable-kernel=3.2.0"
-
-OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}" &&
-
-# minimise optimisation level
- CFLAGS=$(echo ${CFLAGS} | sed -r "s;-O([0-9]|fast);;g") &&
- CFLAGS="-O2 ${CFLAGS//-Os/}"
-
-export CFLAGS="${CFLAGS/-ffast-math/}" &&
-export CC=gcc &&
#
# LD_LIBRARY_PATH includes $PWD bug
@@ -56,57 +17,8 @@ unset LD_LIBRARY_PATH &&
#
cd ${GLIBC_HEADERS_DIR} &&
GL_ARCH=${SMGL_COMPAT_ARCHS[1]} &&
- if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then
- if [[ ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then
- GL_ARCH=sparc64
- fi
- else
- if [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
- GL_ARCH=i386
- fi
- fi &&
- make ARCH=$GL_ARCH INSTALL_HDR_PATH=usr headers_install
+ make INSTALL_HDR_PATH=usr headers_install &&
-if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]];
then
- #
- # If we're not compiling for 64-bit SPARC then we need to use the sparc
- # headers, not sparc64
- #
- if echo "$CFLAGS" | grep -q -- "-m64"; then
- export CC=gcc64
- fi &&
-
- #
- # Fixes from Gentoo's 2.3.3.20040420-r2 ebuild
- #
- sedit "s:CPPFLAGS += -DHAVE_INITFINI:CPPFLAGS += -DHAVE_INITFINI -fno-pie
-fno-PIE:" csu/Makefile
- export CFLAGS="${CFLAGS/-fcall-used-g7/}"
- export CFLAGS="$CFLAGS -fcall-used-g6"
- export CFLAGS="${CFLAGS/-mcpu=v9/}"
- export CFLAGS="${CFLAGS/-mtune=ultrasparc/}"
- export CFLAGS="${CFLAGS/-mvis/}"
-
- # Setup the HOST properly to insure "sparcv9"
- # This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
- [ "$HOST" = "sparc-unknown-linux-gnu" ] &&
- export HOST="sparcv9-unknown-linux-gnu" &&
- [ "$BUILD" = "sparc-unknown-linux-gnu" ] &&
- export BUILD="sparcv9-unknown-linux-gnu"
-elif [[ ${SMGL_COMPAT_ARCHS[0]} == 32 && ${SMGL_COMPAT_ARCHS[1]} == sparc
]]; then
- #
- # Fixes from Gentoo's 2.3.3.20040420-r2 ebuild
- #
- sedit "s:CPPFLAGS += -DHAVE_INITFINI:CPPFLAGS += -DHAVE_INITFINI -fno-pie
-fno-PIE:" csu/Makefile
- export CFLAGS="${CFLAGS/-fcall-used-g7/}"
- export CFLAGS="$CFLAGS -fcall-used-g6"
-elif [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
- # This is a first attempt to get alpha going, being paranoid about any
CFLAGS,
- # not without reason: -Os/-O breaks compile in strange ways:
- # either an elf/ld.so that segfaults (build failing at sunrpc) or
- # internal compiler error(s) in intl/
- # glibc knows itself what flags to choose
- export CFLAGS=""
-fi &&
# CPPFLAGS setting is needed so the check for cpp works on boxes that don't
# have any kernel headers in /usr/include yet
@@ -115,12 +27,6 @@ export CPPFLAGS="$CPPFLAGS
-I$GLIBC_HEADERS_DIR/usr/include" &&
# End sanitised glibc-kernel-headers setup
#
-# this is weird but nscd needs this header from libcap but not the rest of
-# the standard includes so doing this will make nscd pick it up
-mkdir -p $SOURCE_DIRECTORY/nscd/sys &&
-ln -s /usr/include/sys/capability.h $SOURCE_DIRECTORY/nscd/sys/capability.h
&&
-
-#
# Change to where we're going to actually build
#
cd $SOURCE_DIRECTORY.bld &&
@@ -130,7 +36,7 @@ cd $SOURCE_DIRECTORY.bld &&
# Fixes installing glibc on x86_64 without a lib64 symlink/dir
# Bug #441
#
-echo -e "slibdir=/lib" > configparms
+echo -e "slibdir=/lib" > configparms &&
#
# Configure glibc to use the sanitised headers
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 772ca98..4357515 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -88,7 +88,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=LGPL
LICENSE[1]=LGPL
LICENSE[2]=GPL
- STAGED_INSTALL=off
+# STAGED_INSTALL=off
ENTERED=20010922
KEYWORDS="libs"
SHORT="C library for use with GNU/Hurd and GNU/Linux"
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 6d9264c..ceadef5 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,18 @@
+2019-02-23 Treeve Jelbert <treeve AT sourcemage.org>\
+ * DETAILS: enable staging
+ * PRE_INSTALL: protect special libs, simplify
+ * INSTALL: simplify, remove unneeded checks when staging
+
+2019-02-21 Treeve Jelbert <treeve AT sourcemage.org>\
+ * BUILD: remove lots of commented code
+
+2019-02-21 Treeve Jelbert <treeve AT sourcemage.org>\
+ * BUILD: remove lots of obsolete logic, fix building linux headers
+ disable sparc logic
+ * PRE_BUILD: move some sed code from BUILD
+ * PRE_INSTALL: tweak bash syntax
+ generalise & simplify symlink handling for ld-linux*
+
2019-02-18 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD DETAILS INSTALL PREPARE PRE_BUILD: remove non NPTL support,
it implies kerenl-2.4, which is not supported
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index 2e9fdc0..5fbd548 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -5,30 +5,10 @@
install -d ${INSTALL_ROOT}/usr/include &&
cd $GLIBC_HEADERS_DIR/usr/include &&
-echo "installing glibc linux headers" &&
-for dir in *
-do
- install -d ${INSTALL_ROOT}/usr/include/$dir &&
- cp -fa $dir/* ${INSTALL_ROOT}/usr/include/$dir
-done &&
+message "${MESSAGE_COLOR}Installing glibc linux headers${DEFAULT_COLOR}" &&
+cp -a ./* ${INSTALL_ROOT}/usr/include &&
cd $SOURCE_DIRECTORY.bld &&
-
-#
-# glibc only installs these if the file differs
-#
-for i in ${INSTALL_ROOT}/usr/include/bits/syscall.h \
- ${INSTALL_ROOT}/usr/include/gnu/stubs.h \
- ${INSTALL_ROOT}/usr/include/gnu/stubs-32.h \
- ${INSTALL_ROOT}/usr/include/gnu/stubs-64.h; do
- if [ -f $i ]; then
- rm -vf $i
- fi
-done &&
-#
-# End syscall.h and stubs.h fix
-#
-
#
# install
#
@@ -55,4 +35,4 @@ fi &&
install_config_file $SOURCE_DIRECTORY/nscd/nscd.conf \
$INSTALL_ROOT/etc/nscd.conf &&
@@ -68,9 +68,9 @@ rm -rf $GLIBC_HEADERS_DIR/include/drm &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SPELL_DIRECTORY/Makefile.patch &&
# no idea why or how this is missing from configure
-patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&
+# patch -p0 < $SPELL_DIRECTORY/as_fn_executable_p.patch &&
if [[ -z $INSTALL_ROOT ]]; then
protect_special_libs() {
- mkdir -p $PROTECT &&
+ message "${MESSAGE_COLOR}Protecting special libraries${DEFAULT_COLOR}" &&
+ mk_source_dir $PROTECT &&
+
local each &&
for each in /lib{,64,32}/*; do
if test -f "$each"; then
@@ -23,6 +25,7 @@ fi
# these two fucnctions
do_dispel() {
+ message "${MESSAGE_COLOR}Dispelling $SPELL${DEFAULT_COLOR}" &&
if spell_ok $SPELL; then
dispel --notriggers --nosustain $SPELL
fi
diff --git a/vulkan/vulkan-headers/DETAILS b/vulkan/vulkan-headers/DETAILS
index 5734455..c9be0f7 100755
--- a/vulkan/vulkan-headers/DETAILS
+++ b/vulkan/vulkan-headers/DETAILS
@@ -1,7 +1,7 @@
SPELL=vulkan-headers
SPELLX=Vulkan-Headers
- VERSION=1.1.100
-
SOURCE_HASH=sha512:d275ac563a6481ebe938f6267b0bd7165800f183d9ea712836e5a9eb0ad4f9ad2e3b0ffb6ef8b43010485cd035568fed9c91c7f4528a2ba7729c8aace255e5e1
+ VERSION=1.1.101
+
SOURCE_HASH=sha512:1b9ebd3778987d65ffd590311fa1489edbd499bd423be9892f0fa8d4db670937ead3f56307b94ed37c91e8be25ff3465821529eb3b31446df5899feb0b3911d1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://github.com/KhronosGroup/$SPELLX
diff --git a/vulkan/vulkan-headers/HISTORY b/vulkan/vulkan-headers/HISTORY
index a1f9686..0c73629 100644
--- a/vulkan/vulkan-headers/HISTORY
+++ b/vulkan/vulkan-headers/HISTORY
@@ -1,3 +1,6 @@
+2019-02-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.101
+
2019-02-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.100