| 1 |
mrness 07/09/26 09:05:02 |
| 2 |
|
| 3 |
Modified: openswan-2.4.9-r1.ebuild |
| 4 |
Log: |
| 5 |
improve get_make_options(); use $KERNEL_DIR |
| 6 |
(Portage version: 2.1.2.12) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-misc/openswan/openswan-2.4.9-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: openswan-2.4.9-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- openswan-2.4.9-r1.ebuild 26 Sep 2007 08:14:22 -0000 1.1 |
| 22 |
+++ openswan-2.4.9-r1.ebuild 26 Sep 2007 09:05:02 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v 1.1 2007/09/26 08:14:22 mrness Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.9-r1.ebuild,v 1.2 2007/09/26 09:05:02 mrness Exp $ |
| 28 |
|
| 29 |
inherit eutils linux-info |
| 30 |
|
| 31 |
@@ -31,7 +31,7 @@ |
| 32 |
MYMAKE="programs" |
| 33 |
|
| 34 |
elif kernel_is 2 4; then |
| 35 |
- if ! [ -d /usr/src/linux/net/ipsec ]; then |
| 36 |
+ if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then |
| 37 |
eerror "You need to have an IPsec enabled 2.4.x kernel." |
| 38 |
eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" |
| 39 |
die |
| 40 |
@@ -55,37 +55,35 @@ |
| 41 |
} |
| 42 |
|
| 43 |
get_make_options() { |
| 44 |
- local MY_MAKE_OPTIONS="FINALCONFDIR=/etc/ipsec \ |
| 45 |
+ echo KERNELSRC=\"${KERNEL_DIR}\" \ |
| 46 |
+ FINALCONFDIR=/etc/ipsec \ |
| 47 |
INC_RCDEFAULT=/etc/init.d \ |
| 48 |
INC_USRLOCAL=/usr \ |
| 49 |
INC_MANDIR=share/man \ |
| 50 |
FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ |
| 51 |
- FINALDOCDIR=/usr/share/doc/${P}" |
| 52 |
+ FINALDOCDIR=/usr/share/doc/${P} \ |
| 53 |
+ DESTDIR=\"${D}\" \ |
| 54 |
+ USERCOMPILE=\"${CFLAGS}\" |
| 55 |
if use smartcard ; then |
| 56 |
- MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_SMARTCARD=true" |
| 57 |
+ echo USE_SMARTCARD=true |
| 58 |
fi |
| 59 |
if use extra-algorithms ; then |
| 60 |
- MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_EXTRACRYPTO=true" |
| 61 |
+ echo USE_EXTRACRYPTO=true |
| 62 |
fi |
| 63 |
if use weak-algorithms ; then |
| 64 |
- MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_WEAKSTUFF=true" |
| 65 |
+ echo USE_WEAKSTUFF=true |
| 66 |
fi |
| 67 |
- echo ${MY_MAKE_OPTIONS} |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
- emake \ |
| 72 |
- DESTDIR="${D}" \ |
| 73 |
- USERCOMPILE="${CFLAGS}" \ |
| 74 |
- $(get_make_options) \ |
| 75 |
+ eval set -- $(get_make_options) |
| 76 |
+ emake "$@" \ |
| 77 |
${MYMAKE} || die "emake failed" |
| 78 |
} |
| 79 |
|
| 80 |
src_install() { |
| 81 |
- emake \ |
| 82 |
- DESTDIR="${D}" \ |
| 83 |
- USERCOMPILE="${CFLAGS}" \ |
| 84 |
- $(get_make_options) \ |
| 85 |
+ eval set -- $(get_make_options) |
| 86 |
+ emake "$@" \ |
| 87 |
install || die "emake install failed" |
| 88 |
|
| 89 |
dosym /etc/ipsec/ipsec.d /etc/ipsec.d |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
-- |
| 94 |
gentoo-commits@g.o mailing list |
Archives