sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (7bf6486e67d14ad00529aed03dd75d853fe96c48)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7bf6486e67d14ad00529aed03dd75d853fe96c48)
- Date: Thu, 13 Sep 2018 08:02:29 +0000
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
gnu/gcc/0001-fix-isl-0.20.patch | 13 +++++++++
gnu/gcc/HISTORY | 6 ++++
gnu/gcc/PRE_BUILD | 4 ++
libs/isl/DETAILS | 4 +-
libs/isl/HISTORY | 12 ++++++++
science/boinc/BUILD | 12 +++-----
science/boinc/CONFLICTS | 1
science/boinc/DEPENDS | 20 ++++++++------
science/boinc/DETAILS | 24 ++++++++--------
science/boinc/HISTORY | 17 +++++++++++
science/boinc/INSTALL | 6 ++--
science/boinc/PREPARE | 2 +
science/boinc/PRE_BUILD | 2 -
science/boinc/boinc-7.8.6.tar.gz.sig |binary
science/boinc/init.d/boinc | 50
+++++++++++++++++++----------------
15 files changed, 116 insertions(+), 57 deletions(-)
New commits:
commit 7bf6486e67d14ad00529aed03dd75d853fe96c48
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
boinc: Updated stable to 7.8.6, use git for SCM version
License is LGPL
GUI untested, may not even use wxGTK anymore. :)
Add links to compiling Boinc from source
Remove subversion
Depend on git if building from source
Depends on libnotify
Remove self-conflict
Fix client binary name
Fix typo for BOINC_ERROR
Fix using /etc/sysconfig/boinc for parameters
Properly kill boinc_client when stopping
commit 73969776d08127352ecd2a725264f848ecc0c112
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gcc: Apply 0001-fix-isl-0.20.patch
Print message about Go patch as well.
0001-fix-isl-0.20.patch: Patch to build against isl 0.20
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724
commit 160c6838fdfebf42ac07b65e27db4daf97093c04
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
isl: Updated to 0.20
I don't know how anyone updated past 0.18, as 0.19+ ABI changed, removing
libisl.so.15 which gcc is linked against if using Cloog (default),
breaking
cc1 so nothing compiles after.
/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/cc1: error while loading shared
libraries: libisl.so.15: cannot open shared object file: No such file or
directory
I had to downgrade isl to 0.18, build gcc without Cloog, upgrade isl, then
build gcc with Cloog again against isl 0.19+.
diff --git a/gnu/gcc/0001-fix-isl-0.20.patch b/gnu/gcc/0001-fix-isl-0.20.patch
new file mode 100644
index 0000000..db1a54a
--- /dev/null
+++ b/gnu/gcc/0001-fix-isl-0.20.patch
@@ -0,0 +1,13 @@
+# From https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724
+--- branches/gcc-6-branch/gcc/graphite.h 2018/08/14 14:33:20 263538
++++ branches/gcc-6-branch/gcc/graphite.h 2018/08/14 15:15:39 263539
+@@ -40,6 +40,8 @@
+ #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
+ /* isl 0.15 or later. */
+ #include <isl/schedule_node.h>
++#include <isl/id.h>
++#include <isl/space.h>
+
+ #else
+ /* isl 0.14 or 0.13. */
+
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 88f4ccb..0a043e2 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,9 @@
+2018-09-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply 0001-fix-isl-0.20.patch
+ Print message about Go patch as well.
+ * 0001-fix-isl-0.20.patch: Patch to build against isl 0.20
+ See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724
+
2018-07-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 8.2.0
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index b015821..b39cef4 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -28,10 +28,14 @@ cd ${SOURCE_DIRECTORY} &&
mk_source_dir $SOURCE_DIRECTORY.bld &&
cd $SOURCE_DIRECTORY &&
+message "${MESSAGE_COLOR}Applying patch for isl 0.20...${DEFAULT_COLOR}" &&
+patch -p2 < "${SPELL_DIRECTORY}/0001-fix-isl-0.20.patch" &&
+
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
if list_find "$GCC_COMPILER" "go"; then
+ message "${MESSAGE_COLOR}Applying patch for Go header
generation...${DEFAULT_COLOR}" &&
patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
fi
diff --git a/libs/isl/DETAILS b/libs/isl/DETAILS
index 99746f2..782928c 100755
--- a/libs/isl/DETAILS
+++ b/libs/isl/DETAILS
@@ -1,8 +1,8 @@
SPELL=isl
- VERSION=0.19
+ VERSION=0.20
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=http://${SPELL}.gforge.inria.fr/${SOURCE}
-
SOURCE_HASH=sha512:eeda0405d38f77a18c6e69128948dc29af7e44ce827e9fb538d3844c6e22db3b4126287ca0937d9bee7b528bbab7aad8d3729db36e74864196f57e81943dade4
+
SOURCE_HASH=sha512:394bccd22d8e63cb052a60ad8b1a75f4ec43916a9482c66f5167b534b538161179c47919815983b7fbc20dfaa1a590e88b251850aa092bbffc2891635bf30dc4
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://isl.gforge.inria.fr/";
LICENSE[0]="MIT"
diff --git a/libs/isl/HISTORY b/libs/isl/HISTORY
index 665365e..ea6f6e6 100644
--- a/libs/isl/HISTORY
+++ b/libs/isl/HISTORY
@@ -1,3 +1,14 @@
+2018-09-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.20
+ I don't know how anyone updated past 0.18, as 0.19+ ABI changed,
removing
+ libisl.so.15 which gcc is linked against if using Cloog (default),
breaking
+ cc1 so nothing compiles after.
+
+ /usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/cc1: error while loading
shared libraries: libisl.so.15: cannot open shared object file: No such file
or directory
+
+ I had to downgrade isl to 0.18, build gcc without Cloog, upgrade
isl, then
+ build gcc with Cloog again against isl 0.19+.
+
2018-07-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.19
@@ -15,3 +26,4 @@
2014-09-17 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: spell created
+
diff --git a/science/boinc/BUILD b/science/boinc/BUILD
index 0972741..5c7da36 100755
--- a/science/boinc/BUILD
+++ b/science/boinc/BUILD
@@ -1,12 +1,10 @@
#disabling the server intentionally, because it doesn't build
#I left the logic in case someone can get the server to build
-BOINC_PARTS="client" &&
-if [[ $BOINC_PARTS == client ]]
-then
+BOINC_PARTS='client' &&
+
+if [[ "x${BOINC_PARTS}" == 'xclient' ]]; then
OPTS="$OPTS --disable-server"
-fi &&
-if [[ $BOINC_PARTS == server ]]
-then
+elif [[ "x${BOINC_PARTS}" == 'xserver' ]]; then
OPTS="$OPTS --disable-client"
fi &&
@@ -19,6 +17,6 @@ case "${SMGL_COMPAT_ARCH[0]}" in
;;
esac &&
-OPTS="$OPTS --with-gnu-ld --program-suffix=-svn -C --enable-unicode"
+OPTS="$OPTS --with-gnu-ld -C --enable-unicode" &&
default_build
diff --git a/science/boinc/CONFLICTS b/science/boinc/CONFLICTS
deleted file mode 100755
index c8dbfb2..0000000
--- a/science/boinc/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts boinc y
diff --git a/science/boinc/DEPENDS b/science/boinc/DEPENDS
index 72eb4e5..549344c 100755
--- a/science/boinc/DEPENDS
+++ b/science/boinc/DEPENDS
@@ -1,11 +1,11 @@
-depends subversion &&
-depends autoconf &&
-depends automake &&
-depends curl &&
-depends -sub CXX gcc &&
-depends SSL &&
-depends psmisc &&
-depends zlib &&
+depends autoconf &&
+depends automake &&
+depends curl &&
+depends -sub CXX gcc &&
+depends libnotify &&
+depends SSL &&
+depends psmisc &&
+depends zlib &&
if [[ $BOINC_PARTS == both || $BOINC_PARTS == client ]]
then
@@ -15,6 +15,10 @@ then
'for wxGTK-based GUI'
fi &&
+if [[ "x${BOINC_SCM}" == "xy" ]]; then
+ depends git
+fi &&
+
if [[ $BOINC_PARTS == both || $BOINC_PARTS == server ]]
then
depends MYSQL 'MYSQL_CONFIG=mysql_config'
diff --git a/science/boinc/DETAILS b/science/boinc/DETAILS
index 3b486bd..8956f88 100755
--- a/science/boinc/DETAILS
+++ b/science/boinc/DETAILS
@@ -1,19 +1,19 @@
SPELL=boinc
-if [ "$BOINC_UPDATE_DAILY" == "y" ]
-then
+if [[ "x${BOINC_SCM}" == "xy" ]]; then
VERSION=$(date +%Y%m%d)
- BRANCH=trunk/boinc
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_IGNORE=volatile
+ SOURCE_URL[0]=git://github.com/BOINC/boinc.git
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-git
else
- VERSION=6_4_7
- BRANCH=tags/boinc_core_release_$VERSION
+ VERSION=7.8.6
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/BOINC/boinc/archive/client_release/${VERSION%.*}/${VERSION}.tar.gz
+ SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-client_release-${VERSION%.*}-${VERSION}
fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://boinc.berkeley.edu/svn/$BRANCH:$SPELL
- SOURCE_IGNORE=volatile
- LICENSE[0]=GPL
- PATCHLEVEL=2
+ LICENSE[0]=LGPL
WEB_SITE=http://boinc.berkeley.edu/
ENTERED=20010922
KEYWORDS="utils setiathome"
diff --git a/science/boinc/HISTORY b/science/boinc/HISTORY
index 9e5d1df..46597fb 100644
--- a/science/boinc/HISTORY
+++ b/science/boinc/HISTORY
@@ -1,4 +1,19 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+2018-09-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 7.8.6, use git for SCM version
+ License is LGPL
+ GUI untested, may not even use wxGTK anymore. :)
+ * PREPARE: Add links to compiling Boinc from source
+ * DEPENDS: Remove subversion
+ Depend on git if building from source
+ Depends on libnotify
+ * CONFLICTS: Remove self-conflict
+ * BUILD: Fix client binary name
+ * INSTALL: Fix client binary name
+ * init.d/boinc: Fix client binary name, fix typo for BOINC_ERROR
+ Fix using /etc/sysconfig/boinc for parameters
+ Properly kill boinc_client when stopping
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
diff --git a/science/boinc/INSTALL b/science/boinc/INSTALL
index 6f5654e..2bc4387 100755
--- a/science/boinc/INSTALL
+++ b/science/boinc/INSTALL
@@ -1,6 +1,6 @@
default_install &&
-if [ "$BOINC_SETUID" == "y" ]; then
- chown boinc:boinc $INSTALL_ROOT/usr/bin/boinc_client-svn &&
- chmod ug+s $INSTALL_ROOT/usr/bin/boinc_client-svn
+if [[ "x${BOINC_SETUID}" == "xy" ]]; then
+ chown boinc:boinc "${INSTALL_ROOT}/usr/bin/boinc_client" &&
+ chmod ug+s "${INSTALL_ROOT}/usr/bin/boinc_client"
fi
diff --git a/science/boinc/PREPARE b/science/boinc/PREPARE
index 67d2cd0..f2cd26a 100755
--- a/science/boinc/PREPARE
+++ b/science/boinc/PREPARE
@@ -1 +1,3 @@
+# https://boinc.berkeley.edu/trac/wiki/SourceCodeGit
+# https://boinc.berkeley.edu/trac/wiki/CompileClient
config_query BOINC_UPDATE_DAILY "Automatically update on every system
update?" n
diff --git a/science/boinc/PRE_BUILD b/science/boinc/PRE_BUILD
index da6edf1..121235d 100755
--- a/science/boinc/PRE_BUILD
+++ b/science/boinc/PRE_BUILD
@@ -1,4 +1,4 @@
create_account boinc '/var/lib/boinc' &&
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "${SOURCE_DIRECTORY}" &&
./_autosetup
diff --git a/science/boinc/boinc-7.8.6.tar.gz.sig
b/science/boinc/boinc-7.8.6.tar.gz.sig
new file mode 100644
index 0000000..a4da592
Binary files /dev/null and b/science/boinc/boinc-7.8.6.tar.gz.sig differ
diff --git a/science/boinc/init.d/boinc b/science/boinc/init.d/boinc
index cc522d5..00281db 100755
--- a/science/boinc/init.d/boinc
+++ b/science/boinc/init.d/boinc
@@ -3,7 +3,7 @@
. /etc/sysconfig/boinc
PIDFILE="/var/run/boinc.pid"
-PROGRAM="/usr/bin/boinc_client-svn"
+PROGRAM="/usr/bin/boinc_client"
ARGS="-dir ${BOINC_HOME}"
RUNLEVEL=3
NEEDS="+network +remote_fs"
@@ -12,35 +12,41 @@ NEEDS="+network +remote_fs"
function start()
{
- if [ -e ${PIDFILE} ]; then
- echo "Boinc is already running"
- exit 1
- else
- touch ${PIDFILE}
+ if [ -f ${PIDFILE} ]; then
+ echo "Boinc is already running"
+ exit 1
fi
- if ! [ -e ${BOINC_LOGDIR} ]; then
- mkdir -p ${BOINC_LOGDIR}
- chown boinc:boinc ${BOINC_LOGDIR}
+ if ! [ -d ${BOINC_LOGDIR} ]; then
+ mkdir -p ${BOINC_LOGDIR}
+ chown boinc:boinc ${BOINC_LOGDIR}
fi
- if ! [ -e ${BOINC_HOME} ]; then
- mkdir -p ${BOINC_HOME}
- chown boinc:boinc ${BOINC_HOME}
- echo "Starting boinc..."
- cd ${BOINC_HOME}
- ${PROGRAM} ${ARGS} -attach_project ${BOINC_URL} ${BOINC_KEY}
${BOINC_PARMS} >> ${BOINC_LOG} 2>>${$BOINC_ERROR} &
- else
- echo "Starting boinc..."
- cd ${BOINC_HOME}
- ${PROGRAM} ${ARGS} ${BOINC_PARMS} >> ${BOINC_LOG} 2>>${BOINC_ERROR} &
+ if ! [ -d ${BOINC_HOME} ]; then
+ mkdir -p ${BOINC_HOME}
+ chown boinc:boinc ${BOINC_HOME}
fi
+
+ if [ -z ${BOINC_URL} ]; then
+ echo "Setup BOINC_URL in /etc/sysconfig/boinc..."
+ exit 1
+ fi
+
+ if [ -z ${BOINC_KEY} ]; then
+ echo "Setup BOINC_KEY in /etc/sysconfig/boinc..."
+ exit 1
+ fi
+
+ echo "Starting boinc..."
+ cd ${BOINC_HOME}
+ ${PROGRAM} ${ARGS} -attach_project ${BOINC_URL} ${BOINC_KEY}
${BOINC_PARMS} >> ${BOINC_LOG} 2>>${BOINC_ERROR} &
+ pidof ${PROGRAM} > ${PIDFILE}
}
function stop() {
- echo "Stopping boinc..."
- killall -HUP ${PROGRAM}
- rm -f ${PIDFILE}
+ echo "Stopping boinc..."
+ kill $(pidof ${PROGRAM}) 2>/dev/null
+ rm -f ${PIDFILE} 2>/dev/null
}
function restart() {
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (7bf6486e67d14ad00529aed03dd75d853fe96c48), Eric Sandall, 09/13/2018
Archive powered by MHonArc 2.6.24.