Browse Source

hannes:


			
			
				rocklinux
			
			
		
hannes 20 years ago
parent
commit
6695a6103a
4 changed files with 2 additions and 146 deletions
  1. +0
    -7
      package/base/acl/acl.conf
  2. +2
    -2
      package/base/acl/acl.desc
  3. +0
    -107
      package/base/acl/autoconf.patch
  4. +0
    -30
      package/base/acl/buildmacros.patch

+ 0
- 7
package/base/acl/acl.conf

@ -20,13 +20,6 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
# see hotfixes in autoconf.patch
automakever="-1.7"
autogen=1
# do not try to detect rpm
export RPM=/no
# also install headers and libs
makeinstopt="$makeinstopt install-dev install-lib"

+ 2
- 2
package/base/acl/acl.desc

@ -36,8 +36,8 @@
[L] GPL
[S] Stable
[V] 2.2.7
[V] 2.2.23
[P] X -?---5---9 141.300
[D] 1293764680 acl-2.2.7.src.tar.gz http://acl.bestbits.at/current/tar/
[D] 1741465110 acl-2.2.23.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/

+ 0
- 107
package/base/acl/autoconf.patch

@ -1,107 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/acl/autoconf.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./configure.in.orig 2003-04-07 12:28:53.000000000 -0600
+++ ./configure.in 2003-04-07 12:40:40.000000000 -0600
@@ -58,37 +58,37 @@
AC_SUBST(pkg_group)
dnl check if user wants their own C compiler
-test -z "$CC" && AC_PROG_CC
+AC_PROG_CC
cc=$CC
AC_SUBST(cc)
dnl check if users wants their own make
-test -z "$MAKE" && AC_PATH_PROG(MAKE, make, /usr/bin/make)
+AC_PATH_PROG(MAKE, make, /usr/bin/make)
make=$MAKE
AC_SUBST(make)
dnl check if users wants their own linker
-test -z "$LD" && AC_PATH_PROG(LD, ld, /usr/bin/ld)
+AC_PATH_PROG(LD, ld, /usr/bin/ld)
ld=$LD
AC_SUBST(ld)
dnl check if the tar program is available
-test -z "$TAR" && AC_PATH_PROG(TAR, tar)
+AC_PATH_PROG(TAR, tar)
tar=$TAR
AC_SUBST(tar)
dnl check if the gzip program is available
-test -z "$ZIP" && AC_PATH_PROG(ZIP, gzip, /bin/gzip)
+AC_PATH_PROG(ZIP, gzip, /bin/gzip)
zip=$ZIP
AC_SUBST(zip)
dnl check if the makedepend program is available
-test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
makedepend=$MAKEDEPEND
AC_SUBST(makedepend)
dnl check if the rpm program is available
-test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm)
+AC_PATH_PROG(RPM, rpm, /bin/rpm)
rpm=$RPM
AC_SUBST(rpm)
@@ -114,18 +114,18 @@
AC_PROG_LN_S
dnl check if user wants their own awk, sed and echo
-test -z "$AWK" && AC_PATH_PROG(AWK, awk, /bin/awk)
+AC_PATH_PROG(AWK, awk, /bin/awk)
awk=$AWK
AC_SUBST(awk)
-test -z "$SED" && AC_PATH_PROG(SED, sed, /bin/sed)
+AC_PATH_PROG(SED, sed, /bin/sed)
sed=$SED
AC_SUBST(sed)
-test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo)
+AC_PATH_PROG(ECHO, echo, /bin/echo)
echo=$ECHO
AC_SUBST(echo)
dnl ensure libtool is installed
-test -z "$LIBTOOL" && AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
+AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
if test "$LIBTOOL" = ""; then
echo
echo 'FATAL ERROR: libtool does not seem to be installed.'
@@ -150,14 +150,14 @@
dnl check if the msgfmt, msgmerge, xgettext programs are available
if test "$enable_gettext" = yes; then
- test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
+ AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
- test -z "$MSGMERGE" && AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
+ AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
- test -z "$XGETTEXT" && AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext)
+ AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext)
xgettext=$XGETTEXT
AC_SUBST(xgettext)

+ 0
- 30
package/base/acl/buildmacros.patch

@ -1,30 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/acl/buildmacros.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- old/include/buildmacros 2003-03-31 08:57:56.000000000 +0200
+++ new/include/buildmacros 2003-07-09 01:31:19.000000000 +0200
@@ -103,8 +103,6 @@
../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

Loading…
Cancel
Save