|
Lines 27-45
Link Here
|
| 27 |
|
27 |
|
| 28 |
cd "${S}" |
28 |
cd "${S}" |
| 29 |
|
29 |
|
| 30 |
# Purge Makefile w/o any patches |
30 |
einfo "Purge Makefile params w/o any patch" |
| 31 |
local my_incs="-I. \`pkg-config --cflags xft xmu libpng\`" |
31 |
local my_incs="-I. \`pkg-config --cflags xft xmu libpng\`" |
| 32 |
local my_libs="\`pkg-config --libs xft xmu libpng\` -lcrypt -ljpeg" |
32 |
local my_libs="\`pkg-config --libs xft xmu libpng\` -lcrypt -ljpeg" |
| 33 |
sed -i \ |
33 |
sed -i \ |
| 34 |
-e "s:^CXX=.*:CXX=$(tc-getCXX):" \ |
34 |
-e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \ |
| 35 |
-e "s:^CC=.*:CC=$(tc-getCC):" \ |
35 |
-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ |
| 36 |
-e "s:^CFLAGS=.*:CFLAGS=${CFLAGS} ${my_incs}:" \ |
36 |
-e "s:^CFLAGS=.*:CFLAGS=${my_incs}:" \ |
| 37 |
-e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS} ${my_libs}:" \ |
37 |
-e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS} ${my_libs}:" \ |
| 38 |
-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ |
38 |
-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ |
| 39 |
-e "s:^DESTDIR=.*::" \ |
39 |
-e "s:^DESTDIR=.*::" \ |
| 40 |
Makefile || die 'sed failed in Makefile' |
40 |
Makefile || die 'sed for Makefile params failed' |
| 41 |
|
41 |
|
| 42 |
# Remove all X11R6 references from slim.conf |
42 |
einfo "Purge linking order for --as-needed" |
|
|
43 |
sed -i \ |
| 44 |
-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ |
| 45 |
Makefile || die "sed for Makefile linking order" |
| 46 |
|
| 47 |
einfo "Remove all X11R6 references from slim.conf" |
| 43 |
# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop |
48 |
# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop |
| 44 |
# Set the default logfile to /dev/null to avoid cluttering up the harddisk |
49 |
# Set the default logfile to /dev/null to avoid cluttering up the harddisk |
| 45 |
# as slim puts a lot of garbage in it's logfile |
50 |
# as slim puts a lot of garbage in it's logfile |
|
Lines 48-60
Link Here
|
| 48 |
-e "s#/usr/bin:##" \ |
53 |
-e "s#/usr/bin:##" \ |
| 49 |
-e "s/# daemon/daemon/" \ |
54 |
-e "s/# daemon/daemon/" \ |
| 50 |
-e "s#/var/log/slim.log#/dev/null#g" \ |
55 |
-e "s#/var/log/slim.log#/dev/null#g" \ |
| 51 |
slim.conf || die "sed slim.conf failed" |
56 |
slim.conf || die "sed for slim.conf failed" |
| 52 |
|
57 |
|
| 53 |
# Silence all warnigs for "-O2 -Wall" |
58 |
#einfo "Silence all warnigs for \"-O2 -Wall\"" |
| 54 |
epatch "${FILESDIR}"/${P}_image-x-to-lx.patch |
59 |
# Merged upstream 1.2.6, yum! :) |
| 55 |
epatch "${FILESDIR}"/${P}_panel-no-unused-uninit.patch |
60 |
#epatch "${FILESDIR}"/${P}_image-x-to-lx.patch |
| 56 |
epatch "${FILESDIR}"/${P}_cfg-use-int.patch |
61 |
#epatch "${FILESDIR}"/${P}_panel-no-unused-uninit.patch |
| 57 |
epatch "${FILESDIR}"/${P}_switchuser-correct-init.patch |
62 |
#epatch "${FILESDIR}"/${P}_cfg-use-int.patch |
|
|
63 |
#epatch "${FILESDIR}"/${P}_switchuser-correct-init.patch |
| 58 |
} |
64 |
} |
| 59 |
|
65 |
|
| 60 |
src_compile() { |
66 |
src_compile() { |
