SlavekB
/
tde-packaging-slackware
mirror of https://github.com/Ray-V/tde-slackbuilds.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added option for building on Raspberry Pi3

Browse Source 
Added patches for building with gcc 7
pull/7/head
Ray-V 7 years ago
parent 7beca23e24
commit 8f1b5e4ceb
10 changed files with 340 additions and 60 deletions
Show Stats Download Patch File Download Diff File

9
Apps/tdeamarok/tdeamarok.SlackBuild
Unescape View File

@ -105,6 +105,15 @@ cd_builddir_fn
-DBUILD_TRANSLATIONS="ON" \
..
<<'Comment'
Error:
[ 99%] Linking CXX shared module libamarok_yauap-engine_plugin.so
/usr/lib/gcc/arm-slackware-linux-gnueabi/7.1.0/../../../../arm-slackware-linux-gnueabi/bin/ld: cannot find -ldbus-tqt-1
Workaround:
Point the build to the exact location ..
Comment
[[ $YAUAP == ON ]] && sed -i "s|-ldbus-tqt-1|$INSTALL_TDE/lib/libdbus-tqt-1.so.0.0.0|" amarok/src/engine/yauap/CMakeFiles/libamarok_yauap-engine_plugin-module.dir/link.txt
make_fn
installdocs_fn

72
BUILD-TDE.sh
Unescape View File

@ -10,7 +10,7 @@ fi
dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \
"
This is the set up script for TDE SlackBuilds on Slackware 14.2 for setting user preferences and options.
This is the set up script for TDE SlackBuilds on Slackware 14.2/current for setting user preferences and options.
Source archives must be placed in the 'src' directory or will be downloaded during the build from a geoIP located mirror site.
@ -119,65 +119,86 @@ So if you choose \Zb\Z3GCC\Zn, the \Zb\Z3g++\Zn compiler will be used. And if yo
rm -f $TMPVARS/SET_MARCH
rm -f $TMPVARS/64_MARCH
rm -f $TMPVARS/ARCH
## use this dialog widget for x86 processors only
[[ $(uname -m) == *86* ]] && {
## get the native march/mtune options
CPU_MARCH=$(gcc -Q -O2 -march=native --help=target | grep -E "march=|mtune=" | tr -d [:blank:])
#
## get the march/mtune options built into gcc to show as an option in the README
GCC_MARCH=$(gcc -Q -O2 --help=target | grep -E "^ -march=|^ -mtune=" | tr -d [:blank:])
#
## what ARCH?
[[ $(getconf LONG_BIT) == 64 ]] && echo x86_64 > $TMPVARS/ARCH || echo i586 > $TMPVARS/ARCH
[[ $(getconf LONG_BIT) == 64 ]] && \
echo x86_64 > $TMPVARS/ARCH || \
{ [[ $GCC_MARCH == *armv* ]] && echo arm > $TMPVARS/ARCH
} \
|| echo i586 > $TMPVARS/ARCH
ARCH=$(cat $TMPVARS/ARCH)
#
## if ARCH=arm, add mfpu
[[ $ARCH == arm ]] && GCC_MARCH=$(gcc -Q -O2 --help=target | grep -E "^ -m" | grep -E "arch=|tune=|fpu=" | tr -d [:blank:])
#
## get the native march/mtune options
NATIVE_MARCH=$(echo $(gcc -Q -O2 -march=native --help=target | grep -E "^ -march=|^ -mtune=" | tr -d [:blank:]))
## Slackware 14.2 gcc 5.3.1 fails on this, [*** Error in `gcc': double free or corruption (top): 0x00308b50 ***], so:
NATIVE_MARCH=${NATIVE_MARCH:-"unknown"}
#
## get the default march/mtune options for a 64-bit build from the gcc configuration
## with a temporary file for the summary screen
[[ $ARCH == x86_64 ]] && GCC_MOPTS="\Zb\Z6$(gcc -Q -O2 --help=target | grep -E "march=|mtune=" | tr -d [:blank:])\Zn which is the gcc default" && echo $GCC_MOPTS|sed 's|which.*$||' > $TMPVARS/64_MARCH
[[ $ARCH == x86_64 ]] && DEFAULT_MARCH=$GCC_MARCH
## set the default march etc. options for RPi3 overriding the gcc configuration
[[ $ARCH == arm ]] && DEFAULT_MARCH="-march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8"
## set the default march/mtune options for i586 and tune for i686 overriding the gcc configuration
[[ $ARCH == i586 ]] && GCC_MOPTS="\Zb\Z6-march=i586 -mtune=i686\Zn"
[[ $ARCH == i586 ]] && DEFAULT_MARCH="-march=i586 -mtune=i686"
#
## run dialog
EXITVAL=2
until [[ $EXITVAL -lt 2 ]] ; do
dialog --cr-wrap --defaultno --no-shadow --colors --ok-label " 2 / 3 " --cancel-label "1" --help-button --help-label "README" --title " gcc cpu optimization " --inputbox \
"
The build can be set up for gcc optimization for the -march and -mtune options.
The build can be set up for gcc optimization.
\Zr\Z4\Zb<1>\Zn - will use the option $(echo $GCC_MOPTS)
\Zr\Z4\Zb<1>\Zn - the default option \Zb\Z6$(echo $DEFAULT_MARCH)\Zn
<\Zb\Z02\Zn> - will use the gcc native option \Zb\Z6$(echo $CPU_MARCH)\Zn for this machine's cpu
<\Zb\Z02\Zn> - the gcc native option \Zb\Z6$(echo $NATIVE_MARCH)\Zn for this machine
<\Zb\Z03\Zn> - edit to specify \Zb\Z6march/mtune\Zn for a target machine
\Zb\Z0 [[ use any arrow key x2 to activate the input box for editing ]]\Zn
" \
21 75 "$(echo $CPU_MARCH)" \
21 75 "$(echo $NATIVE_MARCH)" \
2> $TMPVARS/SET_MARCH && break
EXITVAL=$?
[[ $EXITVAL == 1 ]] && [[ $ARCH == i586 ]] && echo "-march=i586 -mtune=i686" > $TMPVARS/SET_MARCH && break
[[ $EXITVAL == 1 ]] && echo $DEFAULT_MARCH > $TMPVARS/SET_MARCH && break
#
## add this to show what mtune option has been overridden
[[ $ARCH == i586 ]] && I586_MSG=" overriding the option $(gcc -Q -O2 --help=target | grep mtune= | tr -d [:blank:]) configured into gcc"
[[ $EXITVAL == 2 ]] && dialog --aspect 3 --cr-wrap --no-shadow --colors --scrollbar --ok-label "Return" --msgbox \
[[ $EXITVAL == 2 ]] && \
{ [[ $ARCH == x86_64 ]] && OPT1_MESSAGE=" * for x86_64 it is \Zb\Z6$(echo $GCC_MARCH)\Zn which is the gcc default."
} || \
{ [[ $ARCH == arm ]] && OPT1_MESSAGE="* for RPi3 [arm] the options are \Zb\Z6-march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8\Zn overriding the options \Zb\Z6$(echo $GCC_MARCH)\Zn configured into gcc"
} || \
{ [[ $ARCH == i586 ]] && OPT1_MESSAGE=" * for i586 the option has been set at \Zb\Z6-march=i586 -mtune=i686\Zn overriding the option \Zb\Z6$(echo $GCC_MARCH)\Zn configured into gcc"
}
#
dialog --aspect 3 --cr-wrap --no-shadow --colors --scrollbar --ok-label "Return" --msgbox \
"
<\Z2\Zb1\Zn> is the default where the target machine's cpu-type is not known
* for i586 the -mtune= option has been set at i686${I586_MSG:-}
* for x86_64 it is the gcc configured option.
<\Z2\Zb1\Zn> is the generic default for x86, or is pre-set for RPi3
$OPT1_MESSAGE
<\Z2\Zb2\Zn> will be the best option for any builds to be installed on this machine or one with an identical cpu-type.
<\Z2\Zb2\Zn> is the option identified by gcc as native for this machine.
<\Z2\Zb3\Zn> has been included to build packages on this machine for installation on another machine with a known cpu-type, allowing that target machine's cpu instruction set to be fully utilized.
<\Z2\Zb3\Zn> is to override option <2> to build packages on this machine for installation on another machine with a known cpu-type, allowing that target machine's cpu instruction set to be fully utilized.
The relationship between -march and -mtune options and their use is detailed in the gcc man page in the section 'Intel 386 and AMD x86-64 Options'.
" \
0 0
done
}
rm -f $TMPVARS/NUMJOBS
[[ $ARCH == arm ]] && NUMJOBS="-j8"
dialog --cr-wrap --nocancel --no-shadow --colors --title " Parallel Build " --inputbox \
"
Set the number of simultaneous jobs for make to whatever your system will support.
" \
11 75 -j6 \
11 75 ${NUMJOBS:-"-j6"} \
2> $TMPVARS/NUMJOBS
##
@ -546,7 +567,7 @@ New build list \Zb\Z6$NEW_BUILD\Zn
TDE version \Zb\Z6$TDEVERSION\Zn
TDE installation directory \Zb\Z6$INSTALL_TDE\Zn
Compiler \Zb\Z6$COMPILER\Zn
gcc cpu optimization \Zb\Z6${SET_march:-$(cat $TMPVARS/64_MARCH)}\Zn
gcc cpu optimization \Zb\Z6$SET_march\Zn
Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn
Additional languages \Zb\Z6${I18N:-\Z0\Zbnone}\Zn
Include tqt html docs \Zb\Z6$TQT_DOCS\Zn
@ -603,6 +624,7 @@ do
# The real build starts here
script -c "sh ${package}.SlackBuild" $TMP/${package}-build-log || ${EXIT_FAIL:-"true"}
# remove colorizing escape sequences from build-log
# Re: http://serverfault.com/questions/71285/in-centos-4-4-how-can-i-strip-escape-sequences-from-a-text-file
sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/${package}-build-log || ${EXIT_FAIL:-"true"}

3
Core/tdebase/tdebase.SlackBuild
Unescape View File

@ -36,6 +36,9 @@ getsource_fn
untar_fn
listdocs_fn
## patch for gcc7 twin/client.cpp:2978:38: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
sed -i 's|data != None|data != 0|' twin/client.cpp
chown_fn
cd_builddir_fn

2
Core/tdenetwork/tdenetwork.SlackBuild
Unescape View File

@ -34,6 +34,8 @@ getsource_fn
untar_fn
# If speex is installed, include it in the build for jingle
[[ $(grep speex.h /var/log/packages/*speex*) ]] 2>/dev/null && SPX="ON"
## add patch for gcc6
sed -i 's|"functionName"|" functionName "|' kopete/libkopete/kautoconfig.cpp
listdocs_fn

6
Core/tdepim/tdepim.SlackBuild
Unescape View File

@ -32,7 +32,6 @@ source ../../get-source.sh
getsource_fn
untar_fn
listdocs_fn
# If libcaldav is installed, include it in the build for korganizer
[[ $(ls /var/log/packages/libcaldav*) ]] 2>/dev/null && LCALDAV="ON"
@ -40,6 +39,11 @@ listdocs_fn
# If libcarddav is installed, include it in the build for korganizer
[[ $(ls /var/log/packages/libcarddav*) ]] 2>/dev/null && LCARDDAV="ON"
## add patch for gcc7
sed -i "s|Attachment( '\\\0' )|Attachment( TQChar('\\\0') )|" korganizer/koeditorattachments.cpp
listdocs_fn
chown_fn
cd_builddir_fn

136
Misc/inkscape/inkscape.SlackBuild
Unescape View File

@ -60,6 +60,141 @@ listdocs_fn
#cd_builddir_fn - don't use
## gcc7 patches
## fix for: ui/clipboard.cpp:1405:28: error: ‘ScopedPtr’ is not a member of ‘Glib’
## thank you, Gentoo
echo "--- src/ui/clipboard.cpp
+++ src/ui/clipboard.cpp
@@ -148,2 +147,0 @@
- void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
-
@@ -1225,3 +1223 @@
- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
- _inkscape_wait_for_targets(targets);
+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
@@ -1377,33 +1372,0 @@
-}
-
-
-// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
-//
-// https://bugs.launchpad.net/inkscape/+bug/296778
-// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
-//
-// for details. Until this has been fixed upstream we will use our own implementation
-// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
-void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
-{
- //Get a newly-allocated array of atoms:
- GdkAtom* targets = NULL;
- gint n_targets = 0;
- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
- if (!test || (targets == NULL)) {
- return;
- }
-
- //Add the targets to the C++ container:
- for (int i = 0; i < n_targets; i++)
- {
- //Convert the atom to a string:
- gchar* const atom_name = gdk_atom_name(targets[i]);
-
- Glib::ustring target;
- if (atom_name) {
- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
- }
-
- listTargets.push_back(target);
- }" | while read line
do
patch -p0
done
## fix for: ui/tools/flood-tool.cpp:255:49: error: call of overloaded ‘abs(guint32)’ is ambiguous
## thank you, Debian bug #853453
echo "--- src/ui/tools/flood-tool.cpp
+++ src/ui/tools/flood-tool.cpp
@@ -196,6 +196,21 @@
}
/**
+ * \brief Check whether two unsigned integers are close to each other
+ *
+ * \param[in] a The 1st unsigned int
+ * \param[in] b The 2nd unsigned int
+ * \param[in] d The threshold for comparison
+ *
+ * \return true if |a-b| <= d; false otherwise
+ */
+static bool compare_guint32(guint32 const a, guint32 const b, guint32 const d)
+{
+ const int difference = std::abs(static_cast<int>(a) - static_cast<int>(b));
+ return difference <= d;
+}
+
+/**
* Compare a pixel in a pixel buffer with another pixel to determine if a point should be included in the fill operation.
* @param check The pixel in the pixel buffer to check.
* @param orig The original selected pixel to use as the fill target color.
@@ -232,27 +247,35 @@
switch (method) {
case FLOOD_CHANNELS_ALPHA:
- return abs(static_cast<int>(ac) - ao) <= threshold;
+ return compare_guint32(ac, ao, threshold);
case FLOOD_CHANNELS_R:
- return abs(static_cast<int>(ac ? unpremul_alpha(rc, ac) : 0) - (ao ? unpremul_alpha(ro, ao) : 0)) <= threshold;
+ return compare_guint32(ac ? unpremul_alpha(rc, ac) : 0,
+ ao ? unpremul_alpha(ro, ao) : 0,
+ threshold);
case FLOOD_CHANNELS_G:
- return abs(static_cast<int>(ac ? unpremul_alpha(gc, ac) : 0) - (ao ? unpremul_alpha(go, ao) : 0)) <= threshold;
+ return compare_guint32(ac ? unpremul_alpha(gc, ac) : 0,
+ ao ? unpremul_alpha(go, ao) : 0,
+ threshold);
case FLOOD_CHANNELS_B:
- return abs(static_cast<int>(ac ? unpremul_alpha(bc, ac) : 0) - (ao ? unpremul_alpha(bo, ao) : 0)) <= threshold;
+ return compare_guint32(ac ? unpremul_alpha(bc, ac) : 0,
+ ao ? unpremul_alpha(bo, ao) : 0,
+ threshold);
case FLOOD_CHANNELS_RGB:
- guint32 amc, rmc, bmc, gmc;
- //amc = 255*255 - (255-ac)*(255-ad); amc = (amc + 127) / 255;
- //amc = (255-ac)*ad + 255*ac; amc = (amc + 127) / 255;
- amc = 255; // Why are we looking at desktop? Cairo version ignores destop alpha
- rmc = (255-ac)*rd + 255*rc; rmc = (rmc + 127) / 255;
- gmc = (255-ac)*gd + 255*gc; gmc = (gmc + 127) / 255;
- bmc = (255-ac)*bd + 255*bc; bmc = (bmc + 127) / 255;
-
- diff += abs(static_cast<int>(amc ? unpremul_alpha(rmc, amc) : 0) - (amop ? unpremul_alpha(rmop, amop) : 0));
- diff += abs(static_cast<int>(amc ? unpremul_alpha(gmc, amc) : 0) - (amop ? unpremul_alpha(gmop, amop) : 0));
- diff += abs(static_cast<int>(amc ? unpremul_alpha(bmc, amc) : 0) - (amop ? unpremul_alpha(bmop, amop) : 0));
- return ((diff / 3) <= ((threshold * 3) / 4));
-
+ {
+ guint32 amc, rmc, bmc, gmc;
+ //amc = 255*255 - (255-ac)*(255-ad); amc = (amc + 127) / 255;
+ //amc = (255-ac)*ad + 255*ac; amc = (amc + 127) / 255;
+ amc = 255; // Why are we looking at desktop? Cairo version ignores destop alpha
+ rmc = (255-ac)*rd + 255*rc; rmc = (rmc + 127) / 255;
+ gmc = (255-ac)*gd + 255*gc; gmc = (gmc + 127) / 255;
+ bmc = (255-ac)*bd + 255*bc; bmc = (bmc + 127) / 255;
+
+ int diff = 0; // The total difference between each of the 3 color components
+ diff += std::abs(static_cast<int>(amc ? unpremul_alpha(rmc, amc) : 0) - static_cast<int>(amop ? unpremul_alpha(rmop, amop) : 0));
+ diff += std::abs(static_cast<int>(amc ? unpremul_alpha(gmc, amc) : 0) - static_cast<int>(amop ? unpremul_alpha(gmop, amop) : 0));
+ diff += std::abs(static_cast<int>(amc ? unpremul_alpha(bmc, amc) : 0) - static_cast<int>(amop ? unpremul_alpha(bmop, amop) : 0));
+ return ((diff / 3) <= ((threshold * 3) / 4));
+ }
case FLOOD_CHANNELS_H:
return ((int)(fabs(hsl_check[0] - hsl_orig[0]) * 100.0) <= threshold);
case FLOOD_CHANNELS_S:" | while read line
do
patch -p0
done
LDFLAGS="$SLKLDFLAGS" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=c++11" \
@ -69,6 +204,7 @@ CXX=${COMPILER_CXX} \
--prefix=/usr/local \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--disable-static
make_fn
# remove all man pages ..

3
Misc/libmp4v2/libmp4v2.SlackBuild
Unescape View File

@ -38,6 +38,9 @@ listdocs_fn
chown_fn
## patch for gcc7 ../src/rtphint.cpp:342:35: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
sed -i "s|pSlash != '|*pSlash != '|" src/rtphint.cpp
cd_builddir_fn
LDFLAGS="$SLKLDFLAGS" \

2
README
Unescape View File

@ -1,3 +1,5 @@
Build TDE [Trinity Desktop Environment] for Slackware 14.2 and current on i586, x86_64, or Raspberry Pi3 [see README-Raspberry-Pi3.md].
Run ./BUILD-TDE.sh - a dialog based script with a series of screens for user input.
=============================================================

124
README-Raspberry-Pi3.md
Unescape View File

@ -0,0 +1,124 @@
**Building TDE R14.0.4 on the Raspberry Pi3**
BUILD-TDE.sh has been set up with an option to build TDE on the Raspberry Pi3, with [Sarpi](http://sarpi.fatdog.eu/index.php?p=home) supplied kernel/modules/firmware.
All packages build on Slackware current, but because the gcc version is 7.x.x, there have been a number of patches to the source code. Building on Slackware 14.2 has not been completely tested.
Build times are as shown, with the number of parallel jobs set at 8, and with one internationalization locale being included. The build was run with the top off the Pi casing, and the cpu temperature generally remained below 80 °C, occasionally peaking at about [82.5 °C](https://www.raspberrypi.org/documentation/configuration/config-txt/overclocking.md) without heatsinks. All four cpus ran @ 1200MHz [4].
<hr>
[1]
inkscape froze the Pi with anything other than -j1, and was therefore built separately with that number.
[2]
Digikam build failed with gcc-7.x.x, and was built with gcc-5.4.0 on current. Hopefully, a solution to TDE bug [2832](http://bugs.pearsoncomputing.net/show_bug.cgi?id=2832) will eventually be available.
[3]
Avahi-tqt needs non-Slackware libdaemon and avahi packages installed, and these can be built on the Pi from the SlackBuilds.org scripts.
[4]
`echo ondemand > /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor` if needed.
**Build times**
<pre>
<b>Required</b>:
tqt3 50:39
tqtinterface 4:26
arts 6:47
dbus-tqt 24
dbus-1-tqt 51
libart_lgpl 35
tqca-tls 22
tdelibs 52:12
tdebase 54:47
2:51:03
<b>Core</b>:
tdeutils 12:29
tdemultimedia 43:46
tdeartwork 4:53
tdegraphics 21:21
tdegames 14:21
libcaldav 1:51
libcarddav 1:18
tdepim 1:00:09
tdeaddons 8:46
tdesdk 24:38
tdevelop 41:40
tdetoys 2:13
tdeedu 36:07
tdewebdev 23:48
tidy-html5 1:19
speex 47
tdenetwork 38:49
tdeadmin 6:31
tdeaccessibility 10:27
tde-i18n 13:42
6:08:55 8:59:58
<b>Apps/Libs/Misc</b>:
GraphicsMagick 7:08
abakus 1:05
avahi-tqt [3] 2:16
digikam [2] 32:17
dolphin 1:18
graphviz 21:36
gtk-qt-engine 46
gtk3-tqt-engine 2:35
inkscape 3:11:11 [1]
k9copy 5:27
kaffeine 6:28
kbfx 2:03
kbookreader 1:45
kdbg 2:26
kdbusnotification 1:36
kile 5:40
kipi-plugins 13:02
knemo 2:46
knights 2:45
knmap 2:09
koffice 3:40:32
koffice-i18n 1:08
krusader 8:23
kscope 3:16
ksensors 2:24
kshutdown 2:24
ksquirrel 5:37
kvkbd 1:51
kvpnc 8:14
libksquirrel 11:54
libmp4v2 3:21
libpng 39
lxml 9:00
moodbar 37
piklab 19:18
potrace 1:09
potracegui 1:53
rosegarden 28:04
soundkonverter 4:42
tde-style-lipstik 1:50
tde-style-qtcurve 1:25
tdeamarok 9:30
tdefilelight 49
tdegwenview 5:31
tdegwenview-i18n 2:20
tdeio-locate 37
tdek3b 9:25
tdek3b-i18n 30
tdektorrent 13:04
tdelibkdcraw 2:42
tdelibkexiv2 1:51
tdelibkipi 2:25
tdesudo 1:31
tdmtheme 1:35
twin-style-crystal 1:55
xmedcon 1:58
yakuake 2:09
yauap 5
11:41:57 20:41:55
</pre>

43
get-source.sh
Unescape View File

@ -65,40 +65,14 @@ SOURCE=$SRCDIR/${PRGNAM}-${VERSION}.${ARCHIVE_TYPE:-"tar.bz2"}
SRCURL=${SRCURL:-"http://$TDE_MIRROR/releases/${VERSION}$TDEMIR_SUBDIR/${PRGNAM}-${VERSION}.tar.bz2"}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
case "$MARCH" in
i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
armv6hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$MARCH ;;
esac
fi
# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
case "$ARCH" in
i586) SLKCFLAGS="-O2 ${SET_march:-}"
SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX"
;;
x86_64) SLKCFLAGS="-O2 -fPIC ${SET_march:-}"
SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX -L/usr/lib64"
;;
armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX"
;;
armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX"
;;
*) SLKCFLAGS=${SLKCFLAGS:-"O2"}
SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
;;
esac
case "$ARCH" in
arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
*) TARGET=$ARCH-slackware-linux ;;
esac
## 2017-09 removed - ARCH is set in BUILD-TDE.sh
# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
{ [[ $ARCH == x86_64 ]] && SLKCFLAGS="-O2 -fPIC ${SET_march:-}" \
SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX -L/usr/lib64"; } \
|| { SLKCFLAGS="-O2 ${SET_march:-}" \
SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX"; }
# Exit the script on errors:
set -e
@ -148,6 +122,7 @@ fi
untar_fn ()
{
cd $TMP/tmp-$PRGNAM
echo -e "\n unpacking $(basename ${SOURCE}) ... \n"
tar -xf ${SOURCE}
[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) && cd ${PRGNAM} || cd ${PRGNAM}-${VERSION}
}

Write Preview
Loading…
Cancel
Save