archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

merging trunk

Browse Source
This commit is contained in:
Stephan Raue
2010-03-22 00:36:16 +01:00
parent 890feb4608 f7462efa2e
commit a3b746d733
55 changed files with 354 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/path
View File

@@ -162,6 +162,10 @@ setup_toolchain() {
export CXXFLAGS="$TARGET_CXXFLAGS"
export LDFLAGS="$TARGET_LDFLAGS"
export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH"
# set CMAKE configfile for target
export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
elif [ "$1" = host ]; then
export AWK=$HOST_AWK
export CC=$HOST_CC
@@ -178,6 +182,10 @@ setup_toolchain() {
export CXXFLAGS="$HOST_CXXFLAGS"
export LDFLAGS="$HOST_LDFLAGS"
export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH"
# set CMAKE configfile for host
export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
fi
}
setup_toolchain target

1
packages/audio/libcdio/build
View File

@@ -4,7 +4,6 @@
$SCRIPTS/build toolchain
$SCRIPTS/build libiconv
$SCRIPTS/build ncurses
cd $PKG_BUILD
./configure --host=$TARGET_NAME \

3
packages/audio/libcdio/install
View File

@@ -3,7 +3,6 @@
. config/options
$SCRIPTS/install libiconv
$SCRIPTS/install ncurses
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/*/.libs/*.so*[.0-9] $INSTALL/usr/lib

13
packages/compress/zlib/build
View File

@@ -5,14 +5,11 @@
$SCRIPTS/build toolchain
cd $PKG_BUILD
make CC=$TARGET_CC AR="$TARGET_AR rc" RANLIB=$TARGET_RANLIB libz.a
cp -PR libz.a $SYSROOT_PREFIX/usr/lib
make clean
./configure --shared --prefix=/usr
./configure --prefix=/usr \
--libdir=/usr/lib \
--includedir=/usr/include \
--shared
make
$MAKE prefix=$SYSROOT_PREFIX/usr install
$MAKEINSTALL

4
packages/compress/zlib/install
View File

@@ -2,5 +2,5 @@
. config/options
mkdir -p $INSTALL/lib
cp -PR $PKG_BUILD/*.so* $INSTALL/lib
mkdir -p $INSTALL/usr/lib
cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib

20
packages/compress/zlib/patches/10_crosscompile.diff
View File

@@ -1,20 +0,0 @@
--- zlib-1.2.2.orig/configure Wed Nov 17 15:56:53 2004
+++ zlib-1.2.2/configure Wed Nov 17 15:57:37 2004
@@ -75,7 +75,7 @@
CC="$cc"
SFLAGS=${CFLAGS-"-fPIC -O3"}
CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
+ case `echo Linux` in
Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
CYGWIN* | Cygwin* | cygwin* | OS/2* )
EXE='.exe';;
@@ -95,7 +95,7 @@
else
# find system name and corresponding cc options
CC=${CC-cc}
- case `(uname -sr || echo unknown) 2>/dev/null` in
+ case `echo Linux` in
HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
CFLAGS=${CFLAGS-"-O"}
# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}

2
packages/compress/zlib/url
View File

@@ -1 +1 @@
http://www.zlib.net/zlib-1.2.3.tar.bz2
http://www.zlib.net/zlib-1.2.4.tar.bz2

4
packages/debug/gdb/build
View File

@@ -22,7 +22,7 @@ cd objdir
--disable-nls \
--disable-sim \
--without-x \
--enable-tui \
--disable-tui \
--disable-libada \
make
make

4
packages/debug/gdb/install
View File

@@ -7,5 +7,5 @@ $SCRIPTS/install expat
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/objdir/$1/$1 $INSTALL/usr/bin
# cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin
# cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin
cp $PKG_BUILD/objdir/$1/gdbserver/gdbserver $INSTALL/usr/bin
cp $PKG_BUILD/objdir/$1/gdbserver/gdbreplay $INSTALL/usr/bin

1
packages/devel/eggdbus-host/build
View File

@@ -20,6 +20,7 @@ cd .build-host
--sysconfdir=$ROOT/$TOOLCHAIN/etc \
--disable-static \
--enable-shared \
--disable-man-pages \
make
make install

15
packages/graphics/Mesa/install
View File

@@ -12,14 +12,17 @@ $SCRIPTS/install libxcb
$SCRIPTS/install libX11
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/dri
cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
# todo: only in devel build
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo} $INSTALL/usr/bin
if [ "$DEVTOOLS" = yes ]; then
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxdemo $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxgears $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxinfo $INSTALL/usr/bin
fi

2
packages/mediacenter/xbmc-theme-Confluence/url
View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28584.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-28690.tar.bz2

1
packages/mediacenter/xbmc/build
View File

@@ -14,6 +14,7 @@ $SCRIPTS/build alsa-lib
$SCRIPTS/build enca
$SCRIPTS/build curl
$SCRIPTS/build libmicrohttpd
$SCRIPTS/build libssh
$SCRIPTS/build dbus
$SCRIPTS/build hal

1
packages/mediacenter/xbmc/install
View File

@@ -12,6 +12,7 @@ $SCRIPTS/install alsa-lib
$SCRIPTS/install enca
$SCRIPTS/install curl
$SCRIPTS/install libmicrohttpd
$SCRIPTS/install libssh
$SCRIPTS/install dbus
$SCRIPTS/install hal

2
packages/mediacenter/xbmc/url
View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-28584.tar.bz2
http://sources.openelec.tv/svn/xbmc-28690.tar.bz2

28
packages/network/libssh/build Executable file
View File

@@ -0,0 +1,28 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build zlib
$SCRIPTS/build openssl
cd $PKG_BUILD
mkdir -p build
cd build
if [ ! -f $CMAKE_CONF ]; then
echo " ######### ERROR: ##########"
echo " $CMAKE_CONF not found"
echo " please reinstall cmake with: PROJECT=... ./scripts/install cmake"
echo " or do an full rebuild !!!"
echo " "
exit 1
fi
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
..
make
$MAKEINSTALL

9
packages/network/libssh/install Executable file
View File

@@ -0,0 +1,9 @@
#!/bin/sh
. config/options
$SCRIPTS/install zlib
$SCRIPTS/install openssl
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib

1
packages/network/libssh/url Normal file
View File

@@ -0,0 +1 @@
http://www.libssh.org/files/libssh-0.4.2.tar.gz

38
packages/security/Linux-PAM/install
View File

@@ -7,38 +7,38 @@ $SCRIPTS/install gettext
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/etc
cp -PR $PKG_BUILD/modules/pam_env/environment $INSTALL/etc
# cp -PR $PKG_BUILD/data/pam.conf $INSTALL/etc
cp -P $PKG_BUILD/modules/pam_env/environment $INSTALL/etc
# cp -P $PKG_BUILD/data/pam.conf $INSTALL/etc
mkdir -p $INSTALL/etc/pam.d
cp -PR $PKG_DIR/config/* $INSTALL/etc/pam.d
cp -P $PKG_DIR/config/* $INSTALL/etc/pam.d
mkdir -p $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security
cp -PR $PKG_BUILD/modules/pam_time/time.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_access/access.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_group/group.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_limits/limits.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_env/pam_env.conf $INSTALL/etc/security
cp -P $PKG_BUILD/modules/pam_time/time.conf $INSTALL/etc/security
mkdir -p $INSTALL/lib/security
cp -PR $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security
# cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security
cp -PR $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security
cp -PR $PKG_BUILD/modules/pam_unix/unix_chkpwd $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_mkhomedir/.libs/mkhomedir_helper $INSTALL/lib/security
# cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_tally2/.libs/pam_tally2 $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_unix/unix_chkpwd $INSTALL/lib/security
echo "chmod 4755 $INSTALL/lib/security/unix_chkpwd" >> $FAKEROOT_SCRIPT
cp -PR $PKG_BUILD/modules/pam_unix/unix_update $INSTALL/lib/security
cp -P $PKG_BUILD/modules/pam_unix/unix_update $INSTALL/lib/security
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/libpam_misc/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libpam/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libpam_misc/.libs/*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libpam_misc.so*T
cp -PR $PKG_BUILD/libpamc/.libs/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/libpamc/.libs/*.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/security
cp -PR $PKG_BUILD/modules/*/.libs/*.so $INSTALL/usr/lib/security
cp -P $PKG_BUILD/modules/*/.libs/*.so $INSTALL/usr/lib/security
mkdir -p $INSTALL/usr/lib/security/pam_filter
cp -PR $PKG_BUILD/modules/pam_filter/upperLOWER/.libs/upperLOWER $INSTALL/usr/lib/security/pam_filter
cp -P $PKG_BUILD/modules/pam_filter/upperLOWER/.libs/upperLOWER $INSTALL/usr/lib/security/pam_filter
mkdir -p $INSTALL/sbin
cp -PR $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/sbin
cp -P $PKG_BUILD/modules/pam_tally/pam_tally $INSTALL/sbin

32
packages/security/polkit/install
View File

@@ -18,41 +18,41 @@ $SCRIPTS/install expat
$SCRIPTS/install Linux-PAM
mkdir -p $INSTALL/etc/dbus-1/system.d
cp -PR $PKG_BUILD/data/org.freedesktop.PolicyKit1.conf $INSTALL/etc/dbus-1/system.d
cp -P $PKG_BUILD/data/org.freedesktop.PolicyKit1.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/etc/pam.d
cp -PR $PKG_BUILD/data/polkit-1 $INSTALL/etc/pam.d
cp -P $PKG_BUILD/data/polkit-1 $INSTALL/etc/pam.d
mkdir -p $INSTALL/etc/polkit-1/localauthority.conf.d
cp -PR $PKG_BUILD/src/polkitbackend/50-localauthority.conf $INSTALL/etc/polkit-1/localauthority.conf.d
cp -P $PKG_BUILD/src/polkitbackend/50-localauthority.conf $INSTALL/etc/polkit-1/localauthority.conf.d
mkdir -p $INSTALL/etc/polkit-1/nullbackend.conf.d
cp -PR $PKG_BUILD/src/nullbackend/50-nullbackend.conf $INSTALL/etc/polkit-1/nullbackend.conf.d
cp -P $PKG_BUILD/src/nullbackend/50-nullbackend.conf $INSTALL/etc/polkit-1/nullbackend.conf.d
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin
cp -PR $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin
cp -PR $PKG_BUILD/src/programs/.libs/pkexec $INSTALL/usr/bin
cp -P $PKG_BUILD/src/programs/.libs/pkaction $INSTALL/usr/bin
cp -P $PKG_BUILD/src/programs/.libs/pkcheck $INSTALL/usr/bin
cp -P $PKG_BUILD/src/programs/.libs/pkexec $INSTALL/usr/bin
echo "chmod 4755 $INSTALL/usr/bin/pkexec" >> $FAKEROOT_SCRIPT
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/src/polkitagent/.libs/libpolkit-agent-1.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/src/polkitagent/.libs/libpolkit-agent-1.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libpolkit-agent-1.so*T
cp -PR $PKG_BUILD/src/polkitbackend/.libs/libpolkit-backend-1.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/src/polkitbackend/.libs/libpolkit-backend-1.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libpolkit-backend-1.so*T
cp -PR $PKG_BUILD/src/polkit/.libs/libpolkit-gobject-1.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/src/polkit/.libs/libpolkit-gobject-1.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/lib/polkit-1/extensions
cp -PR $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
cp -PR $PKG_BUILD/src/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
cp -P $PKG_BUILD/src/nullbackend/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
cp -P $PKG_BUILD/src/programs/.libs/*.so $INSTALL/usr/lib/polkit-1/extensions
mkdir -p $INSTALL/usr/lib/polkit-1
cp -PR $PKG_BUILD/src/polkitagent/.libs/polkit-agent-helper-1 $INSTALL/usr/lib/polkit-1
cp -P $PKG_BUILD/src/polkitagent/.libs/polkit-agent-helper-1 $INSTALL/usr/lib/polkit-1
echo "chmod 4755 $INSTALL/usr/lib/polkit-1/polkit-agent-helper-1" >> $FAKEROOT_SCRIPT
cp -PR $PKG_BUILD/src/polkitd/.libs/polkitd $INSTALL/usr/lib/polkit-1
cp -P $PKG_BUILD/src/polkitd/.libs/polkitd $INSTALL/usr/lib/polkit-1
mkdir -p $INSTALL/usr/share/dbus-1/system-services
cp -PR $PKG_BUILD/data/org.freedesktop.PolicyKit1.service $INSTALL/usr/share/dbus-1/system-services
cp -P $PKG_BUILD/data/org.freedesktop.PolicyKit1.service $INSTALL/usr/share/dbus-1/system-services
mkdir -p $INSTALL/usr/share/polkit-1/actions
cp -PR $PKG_BUILD/actions/org.freedesktop.policykit.policy $INSTALL/usr/share/polkit-1/actions
cp -P $PKG_BUILD/actions/org.freedesktop.policykit.policy $INSTALL/usr/share/polkit-1/actions

Some files were not shown because too many files have changed in this diff Show More