diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2003-02-28 02:50:02 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2003-02-28 02:50:02 +0000 |
| commit | 041c9a21a23aa46a4c319c8006a3abd5049d5117 (patch) | |
| tree | 8c555c7507c5590ad075c0f76f12d84d541d473a /net-wireless | |
| parent | Initial import. (diff) | |
| download | historical-041c9a21a23aa46a4c319c8006a3abd5049d5117.tar.gz historical-041c9a21a23aa46a4c319c8006a3abd5049d5117.tar.bz2 historical-041c9a21a23aa46a4c319c8006a3abd5049d5117.zip | |
fixed to use HOSTAP_DRIVERS properly
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/hostap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-wireless/hostap/hostap-20021012-r1.ebuild | 25 |
2 files changed, 21 insertions, 9 deletions
diff --git a/net-wireless/hostap/ChangeLog b/net-wireless/hostap/ChangeLog index c0c3e781f155..22eb84b1566d 100644 --- a/net-wireless/hostap/ChangeLog +++ b/net-wireless/hostap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/hostap # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.3 2003/02/25 19:17:52 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.4 2003/02/28 02:50:02 latexer Exp $ + + 27 Feb 2003; Peter Johanson <latexer@gentoo.org> hostap-20021012-r1.ebuild : + Major fixes to work with latest portage. HOSTAP_DRIVERS functionality now works. 25 Feb 2003; Peter Johanson <latexer@gentoo.org> hostap-20021012.ebuild hostap-20021012-r1.ebuild: diff --git a/net-wireless/hostap/hostap-20021012-r1.ebuild b/net-wireless/hostap/hostap-20021012-r1.ebuild index b01b6b30fa1a..271803d6d205 100644 --- a/net-wireless/hostap/hostap-20021012-r1.ebuild +++ b/net-wireless/hostap/hostap-20021012-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-20021012-r1.ebuild,v 1.2 2003/02/25 19:17:52 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-20021012-r1.ebuild,v 1.3 2003/02/28 02:50:02 latexer Exp $ inherit eutils @@ -24,6 +24,13 @@ DEPEND=">=net-wireless/wireless-tools-25 S=${WORKDIR}/${PN}-2002-10-12 LIB_PATH="/lib/modules/${KV}" +if [ -z "${HOSTAP_DRIVERS}" ]; then + CUSTOM="no" + HOSTAP_DRIVERS="pci plx" +else + CUSTOM="yes" +fi + src_unpack() { unpack ${A} cd ${S} @@ -34,12 +41,17 @@ src_unpack() { epatch ${FILESDIR}/${P}-gentoo-patch.diff mv Makefile ${T} - sed -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${WORKDIR}/${MY_PCMCIA}:" \ - -e "s:gcc:${CC}:" \ + sed -e "s:gcc:${CC}:" \ -e "s:-O2:${CFLAGS}:" \ -e "s:\$(EXTRA_CFLAGS):\$(EXTRA_CFLAGS) -DPRISM2_HOSTAPD:" \ ${T}/Makefile > Makefile + if [ -n "`use pcmcia`" ] || [[ "${HOSTAP_DRIVERS}" == *pccard* ]]; then + mv Makefile ${T} + sed -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${WORKDIR}/${MY_PCMCIA}:" \ + ${T}/Makefile > Makefile + fi + cd ${S}/hostapd mv Makefile ${T} sed -e "s:gcc:${CC}:" \ @@ -48,7 +60,6 @@ src_unpack() { } src_compile() { - # # This ebuild now uses a system similar to the alsa ebuild. # By default, it will install the pci and plx drivers, and @@ -57,17 +68,15 @@ src_compile() { # # HOSTAP_DRIVERS="pci pccard" emerge hostap # + # Available options are pci, plx, and pccard. - if [ -z "${HOSTAP_DRIVERS}" ]; then - CUSTOM="no" - HOSTAP_DRIVERS="pci plx" + if [ "${CUSTOM}" == no ]; then if [ -n "`use pcmcia`" ]; then emake ${HOSTAP_DRIVERS} pccard hostap crypt || die else emake ${HOSTAP_DRIVERS} hostap crypt || die fi else - CUSTOM="yes" einfo "Building the folowing drivers: ${HOSTAP_DRIVERS}" emake ${HOSTAP_DRIVERS} hostap crypt || die fi |