[arch-commits] Commit in (17 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon Feb 4 13:47:56 UTC 2013


    Date: Monday, February 4, 2013 @ 14:47:56
  Author: spupykin
Revision: 83691

remove pkgdir from build()

Modified:
  arm-wince-cegcc-binutils/trunk/PKGBUILD
  arm-wince-cegcc-cegccdll-dummy/trunk/PKGBUILD
  arm-wince-cegcc-cegccdll/trunk/PKGBUILD
  arm-wince-cegcc-cegccthrddll/trunk/PKGBUILD
  arm-wince-cegcc-docs/trunk/PKGBUILD
  arm-wince-cegcc-gcc-base/trunk/PKGBUILD
  arm-wince-cegcc-gcc/trunk/PKGBUILD
  arm-wince-cegcc-importlibs/trunk/PKGBUILD
  arm-wince-cegcc-libstdcppdll/trunk/PKGBUILD
  arm-wince-cegcc-newlib/trunk/PKGBUILD
  arm-wince-cegcc-profile/trunk/PKGBUILD
  arm-wince-cegcc-w32api/trunk/PKGBUILD
  arpwatch/trunk/PKGBUILD
  atk-docs/trunk/PKGBUILD
  aumix/trunk/PKGBUILD
  autossh/trunk/LICENSE
  autossh/trunk/PKGBUILD

-----------------------------------------------+
 arm-wince-cegcc-binutils/trunk/PKGBUILD       |    4 ++++
 arm-wince-cegcc-cegccdll-dummy/trunk/PKGBUILD |    9 +++++----
 arm-wince-cegcc-cegccdll/trunk/PKGBUILD       |    5 +++++
 arm-wince-cegcc-cegccthrddll/trunk/PKGBUILD   |    4 ++++
 arm-wince-cegcc-docs/trunk/PKGBUILD           |    4 ++++
 arm-wince-cegcc-gcc-base/trunk/PKGBUILD       |    4 ++++
 arm-wince-cegcc-gcc/trunk/PKGBUILD            |    4 ++++
 arm-wince-cegcc-importlibs/trunk/PKGBUILD     |    4 ++++
 arm-wince-cegcc-libstdcppdll/trunk/PKGBUILD   |    4 ++++
 arm-wince-cegcc-newlib/trunk/PKGBUILD         |    5 +++++
 arm-wince-cegcc-profile/trunk/PKGBUILD        |    5 ++++-
 arm-wince-cegcc-w32api/trunk/PKGBUILD         |    4 ++++
 arpwatch/trunk/PKGBUILD                       |    5 +++++
 atk-docs/trunk/PKGBUILD                       |    4 ++++
 aumix/trunk/PKGBUILD                          |   14 +++++++++++---
 autossh/trunk/LICENSE                         |   14 +++++++-------
 autossh/trunk/PKGBUILD                        |    8 +++-----
 17 files changed, 81 insertions(+), 20 deletions(-)

Modified: arm-wince-cegcc-binutils/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-binutils/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-binutils/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -31,6 +31,10 @@
 	--includedir=${_prefix}/include
 
   make || (cd etc && make) && make
+}
+
+package() {
+  cd $srcdir/cegcc/src/binutils
   make DESTDIR=$pkgdir install
   rm -rf $pkgdir/opt/cegcc/info
 }

Modified: arm-wince-cegcc-cegccdll/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-cegccdll/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-cegccdll/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -28,6 +28,11 @@
   unset MAKEFLAGS
 
   make
+}
+
+package() {
+  cd $srcdir/cegcc/src/cegcc/cegccdll
+
   mkdir -p $pkgdir/$_prefix/lib/gcc/arm-wince-cegcc/4.4.0/
   cp cegccdll/libcegcc.dll.a $pkgdir/$_prefix/lib/gcc/arm-wince-cegcc/4.4.0/
   make PREFIX=$pkgdir/$_prefix install

Modified: arm-wince-cegcc-cegccdll-dummy/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-cegccdll-dummy/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-cegccdll-dummy/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -16,12 +16,13 @@
 md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
 
 build() {
-  cd $srcdir/cegcc/src/
+  true
+}
 
+package() {
+  cd $srcdir/cegcc/src/cegcc/fakecegccdll
+
   export PATH=$_prefix/bin:$PATH
-
-  cd cegcc/fakecegccdll
   ./install.sh $pkgdir/$_prefix
-
   find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
 }

Modified: arm-wince-cegcc-cegccthrddll/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-cegccthrddll/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-cegccthrddll/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -28,6 +28,10 @@
   unset MAKEFLAGS
 
   make
+}
+
+package() {
+  cd $srcdir/cegcc/src/cegcc/cegccthrd
   make PREFIX=$pkgdir/$_prefix install
   find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
 }

Modified: arm-wince-cegcc-docs/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-docs/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-docs/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -16,6 +16,10 @@
 md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
 
 build() {
+  true
+}
+
+package() {
   cd $srcdir/cegcc/docs
 
   mkdir -p $pkgdir/${_prefix}/share/docs

Modified: arm-wince-cegcc-gcc/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-gcc/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-gcc/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -56,6 +56,10 @@
 	--disable-libssp
 
   make
+}
+
+package() {
+  cd $srcdir/cegcc/src/build-gcc
   make DESTDIR=$pkgdir install
   rm -f $pkgdir/$_prefix/lib/libiberty.a
   find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;

Modified: arm-wince-cegcc-gcc-base/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-gcc-base/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-gcc-base/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -49,6 +49,10 @@
 	--enable-checking
 
   make all-gcc || (cd gcc && make) && make all-gcc
+}
+
+package() {
+  cd $srcdir/cegcc/src/build-gcc-base
   make DESTDIR=$pkgdir install-gcc
   find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
   cd $pkgdir/${_prefix} && ln -s arm-wince-cegcc arm-cegcc

Modified: arm-wince-cegcc-importlibs/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-importlibs/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-importlibs/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -17,6 +17,10 @@
 md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
 
 build() {
+  true
+}
+
+package() {
   cd $srcdir/cegcc/src/
 
   export PATH=$_prefix/bin:$PATH

Modified: arm-wince-cegcc-libstdcppdll/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-libstdcppdll/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-libstdcppdll/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -64,7 +64,11 @@
   sed -i 's#.*unwind-sjlj_s.o#\t\t../../build-gcc/arm-wince-cegcc/libgcc/unwind-sjlj_s.o#' Makefile
 
   make
+}
 
+package() {
+  cd $srcdir/cegcc/src/cegcc/libstdc++
+
   mkdir -p $pkgdir${_prefix}/arm-wince-cegcc/lib
   make PREFIX=$pkgdir/${_prefix} install
 

Modified: arm-wince-cegcc-newlib/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-newlib/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-newlib/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -33,6 +33,11 @@
 	--prefix=$_prefix
 
   make || (cd etc && make) && make
+}
+
+package() {
+  cd $srcdir/cegcc/src/build-newlib
+
   mkdir -p $pkgdir/opt/cegcc/arm-wince-cegcc/lib/
   make DESTDIR=$pkgdir install
   find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;

Modified: arm-wince-cegcc-profile/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-profile/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-profile/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -36,7 +36,10 @@
   make
 
   sed -i "s|prefix = $_prefix|prefix = $pkgdir/$_prefix|g" Makefile
+}
+
+package() {
+  cd $srcdir/cegcc/src/profile
   make install
-
   find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
 }

Modified: arm-wince-cegcc-w32api/trunk/PKGBUILD
===================================================================
--- arm-wince-cegcc-w32api/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arm-wince-cegcc-w32api/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -16,6 +16,10 @@
 md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
 
 build() {
+  true
+}
+
+package() {
   cd $srcdir/cegcc/src/
 
   export PATH=$_prefix/bin:$PATH

Modified: arpwatch/trunk/PKGBUILD
===================================================================
--- arpwatch/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ arpwatch/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -20,6 +20,11 @@
 
   ./configure --prefix=/usr
   make SENDMAIL=/usr/sbin/sendmail
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   install -d -m 0755 $pkgdir/usr/sbin
   make DESTDIR=$pkgdir install
   install -D -m 0644 arpwatch.8 $pkgdir/usr/share/man/man8/arpwatch.8

Modified: atk-docs/trunk/PKGBUILD
===================================================================
--- atk-docs/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ atk-docs/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -14,6 +14,10 @@
 md5sums=('6b34e2a63dda4429b5692be7ca3aa5bf')
 
 build() {
+  true
+}
+
+package() {
   install -d $pkgdir/usr/share/devhelp/books/atk
   install -D -m 644 $srcdir/atk-${pkgver}/docs/html/* \
                     $pkgdir/usr/share/devhelp/books/atk

Modified: aumix/trunk/PKGBUILD
===================================================================
--- aumix/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ aumix/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -22,19 +22,27 @@
          'afba8b39b8dd95d8a9d74356023de14a')
 
 build() {
+  cd $srcdir
+  cp -a aumix-$pkgver aumix-gtk-$pkgver
+
   cd $srcdir/aumix-$pkgver
-
   msg "No X11 build"
   ./configure --prefix=/usr --mandir=/usr/share/man --without-gtk --without-gtk1 \
 	--without-alsa --without-x
   make
-  install -D -m0755 src/aumix $pkgdir/usr/bin/aumix-nox
-  make distclean
 
+  cd $srcdir/aumix-gtk-$pkgver
   msg "X11+GTK2 build"
   ./configure --prefix=/usr --mandir=/usr/share/man --without-gtk1 --without-alsa \
 	--without-gpm
   make
+}
+
+package() {
+  cd $srcdir/aumix-$pkgver
+  install -D -m0755 src/aumix $pkgdir/usr/bin/aumix-nox
+
+  cd $srcdir/aumix-gtk-$pkgver
   make DESTDIR=$pkgdir install
   install -D -m0644 $srcdir/aumix.desktop $pkgdir/usr/share/applications/aumix.desktop
 }

Modified: autossh/trunk/LICENSE
===================================================================
--- autossh/trunk/LICENSE	2013-02-04 13:36:21 UTC (rev 83690)
+++ autossh/trunk/LICENSE	2013-02-04 13:47:56 UTC (rev 83691)
@@ -4,13 +4,13 @@
 Redistribution and use in source and binary forms, with or without
 modification, are freely permitted.
 
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, 
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: autossh/trunk/PKGBUILD
===================================================================
--- autossh/trunk/PKGBUILD	2013-02-04 13:36:21 UTC (rev 83690)
+++ autossh/trunk/PKGBUILD	2013-02-04 13:47:56 UTC (rev 83691)
@@ -15,14 +15,12 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
-  msg "Configuring"
   ./configure --prefix=$pkgdir/usr --sysconfdir=/etc --localstatedir=/var
-
-  msg "Building"
   make
+}
 
-  msg "Creating package"
+package() {
+  cd $srcdir/$pkgname-$pkgver
   install -D -m755 autossh $pkgdir/usr/bin/autossh
   install -D -m644 CHANGES $pkgdir/usr/share/doc/autossh/CHANGES
   install -D -m644 README $pkgdir/usr/share/doc/autossh/README




More information about the arch-commits mailing list