Author: gcasa
Date: Sun Jun 12 10:14:37 2016
New Revision: 39859
URL: http://svn.gna.org/viewcvs/gnustep?rev=39859&view=rev
Log:
Preserve environment for clang build.
Modified:
tools/scripts/trunk/ChangeLog
tools/scripts/trunk/clang-setup
tools/scripts/trunk/compile-all
Modified: tools/scripts/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/ChangeLog?rev=39859&r1=39858&r2=39859&view=diff
==============================================================================
--- tools/scripts/trunk/ChangeLog (original)
+++ tools/scripts/trunk/ChangeLog Sun Jun 12 10:14:37 2016
@@ -1,3 +1,8 @@
+2016-06-12 04:13-EDT Gregory John Casamento <[email protected]>
+
+ * clang-setup: Separate build and install
+ * compile-all: Preserve environment for clang build.
+
2016-05-31 19:42-EDT Gregory John Casamento <[email protected]>
* compile-all: Add -j8 option to speed up the build.
Modified: tools/scripts/trunk/clang-setup
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/clang-setup?rev=39859&r1=39858&r2=39859&view=diff
==============================================================================
--- tools/scripts/trunk/clang-setup (original)
+++ tools/scripts/trunk/clang-setup Sun Jun 12 10:14:37 2016
@@ -1,13 +1,16 @@
#!/bin/sh
+
+SUDO='sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH'
+
cd ~
# pre-create some directories
-#sudo mkdir -p /usr/GNUstep/Local/Library/Libraries
-#sudo mkdir -p /usr/GNUstep/Local/Library/Headers
+#${SUDO} mkdir -p /usr/GNUstep/Local/Library/Libraries
+#${SUDO} mkdir -p /usr/GNUstep/Local/Library/Headers
# cleanup
-rm -rf libdispatch
-rm -rf libobjc2
+${SUDO} rm -rf libdispatch
+${SUDO} rm -rf libobjc2
# pull
git clone https://github.com/gnustep/libobjc2.git
@@ -22,13 +25,15 @@
rm -rf libdispatch-build
mkdir libdispatch-build && cd libdispatch-build
../configure
-sudo make install
-sudo ldconfig
+make
+${SUDO} make install
+${SUDO} ldconfig
cd ~/libobjc2
mkdir libobjc2-build && cd libobjc2-build
cmake ../
-sudo cmake --build . --target install
-sudo ldconfig
+cmake --build . --target install
+${SUDO} -E make install
+${SUDO} ldconfig
Modified: tools/scripts/trunk/compile-all
URL:
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/compile-all?rev=39859&r1=39858&r2=39859&view=diff
==============================================================================
--- tools/scripts/trunk/compile-all (original)
+++ tools/scripts/trunk/compile-all Sun Jun 12 10:14:37 2016
@@ -14,6 +14,7 @@
# <uses `--prefix=/usr/local/GNUstep' as option to configure>
#
+SUDO='sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH'
scriptsdir="`pwd`/scripts"
if [ "$1" != "" ]; then
@@ -102,7 +103,7 @@
CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure --prefix=$prefix
--with-layout=gnustep $make_flags
$MAKE
if [ "true" == "$NEEDSROOT" ]; then
- sudo -u root $MAKE install
+ ${SUDO} -u root $MAKE install
else
$MAKE messages=yes install
fi
@@ -118,7 +119,7 @@
CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure --prefix=$prefix
--with-layout=gnustep $make_flags
$MAKE
if [ "true" == "$NEEDSROOT" ]; then
- sudo -u root $MAKE install
+ ${SUDO} -u root $MAKE install
else
$MAKE messages=yes install
fi
@@ -133,7 +134,7 @@
CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure
--with-installation-domain=SYSTEM ${options}
$MAKE messages=yes debug=yes
if [ "true" == "$NEEDSROOT" ]; then
-sudo -u root ./install.sh $prefix $MAKE
+${SUDO} -u root ./install.sh $prefix $MAKE
else
$MAKE GNUSTEP_INSTALLATION_DOMAIN=SYSTEM messages=yes install
fi
@@ -144,7 +145,7 @@
CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure
$MAKE messages=yes debug=yes
if [ "true" == "$NEEDSROOT" ]; then
-sudo -u root ./install.sh $prefix $MAKE
+${SUDO} -u root ./install.sh $prefix $MAKE
else
$MAKE GNUSTEP_INSTALLATION_DOMAIN=SYSTEM messages=yes install
fi
@@ -155,7 +156,7 @@
CCFLAGS=$cc_flags CXX=$CXX CC=$CC ./configure
$MAKE messages=yes debug=yes
if [ "true" == "$NEEDSROOT" ]; then
-sudo -u root ./install.sh $prefix $MAKE
+${SUDO} -u root ./install.sh $prefix $MAKE
else
$MAKE GNUSTEP_INSTALLATION_DOMAIN=SYSTEM messages=yes install
fi
@@ -163,8 +164,8 @@
# Perform other operations
echo "Add script to etc and xsession..."
if [ ! -e /etc/profile.d/GNUstep.sh ]; then
- sudo -u root ln -s /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
/etc/profile.d/GNUstep.sh
+ ${SUDO} -u root ln -s /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
/etc/profile.d/GNUstep.sh
fi
cd ../../plugins/session
-sudo -u root ./install.sh
+${SUDO} -u root ./install.sh
echo "Done."
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
