Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 311711 Details for
Bug 409577
net-misc/openvpn-9999 - build system re-write
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
openvpn-9999.ebuild.diff
openvpn-9999.ebuild.diff (text/plain), 3.98 KB, created by
Alon Bar-Lev
on 2012-05-14 08:06:53 UTC
(
hide
)
Description:
openvpn-9999.ebuild.diff
Filename:
MIME Type:
Creator:
Alon Bar-Lev
Created:
2012-05-14 08:06:53 UTC
Size:
3.98 KB
patch
obsolete
>--- openvpn-9999.ebuild 2012-03-01 14:10:51.000000000 +0200 >+++ openvpn-9999.ebuild 2012-05-14 11:05:07.341290476 +0300 >@@ -4,49 +4,42 @@ > > EAPI=4 > >-inherit eutils multilib toolchain-funcs autotools flag-o-matic git-2 >+inherit eutils multilib toolchain-funcs > > DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes." >-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}.git" > HOMEPAGE="http://openvpn.net/" > >+if [[ "${PV}" = 9999 ]]; then >+ inherit git-2 autotools >+ KEYWORDS="" >+ EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git" >+else >+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" >+ SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz" >+fi >+ > LICENSE="GPL-2" > SLOT="0" >-KEYWORDS="" >-IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD" >+IUSE="examples iproute2 minimal pam passwordsave selinux +ssl +lzo static pkcs11 userland_BSD" >+ >+REQUIRED_USE="static? ( minimal )" > >-DEPEND=">=dev-libs/lzo-1.07 >+DEPEND=" > kernel_linux? ( > iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) > ) > !minimal? ( pam? ( virtual/pam ) ) > selinux? ( sec-policy/selinux-openvpn ) >- ssl? ( >=dev-libs/openssl-0.9.6 ) >+ ssl? ( >=dev-libs/openssl-0.9.7 ) >+ lzo? ( >=dev-libs/lzo-1.07 ) > pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )" > RDEPEND="${DEPEND}" > > src_prepare() { >- epatch "${FILESDIR}/${P}-pkcs11.patch" >- sed -i \ >- -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \ >- -e "s/-shared/-shared \${LDFLAGS}/" \ >- plugin/*/Makefile || die "sed failed" >- >- # Add GIT commit ID to Product Version >- sed -i \ >- -e "/^define(PRODUCT_VERSION/s/])/-git-${EGIT_VERSION}])/" \ >- version.m4 >- eautoreconf >+ [ "${PV}" = 9999 ] && eautoreconf > } > > src_configure() { >- # basic.h defines a type 'bool' that conflicts with the altivec >- # keyword bool which has to be fixed upstream, see bugs #293840 >- # and #297854. >- # For now, filter out -maltivec on ppc and append -mno-altivec, as >- # -maltivec is enabled implicitly by -mcpu and similar flags. >- (use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec >- > local myconf="" > > if use minimal ; then >@@ -56,29 +49,26 @@ src_configure() { > myconf="$(use_enable pkcs11)" > fi > >+ use static && LDFLAGS="${LDFLAGS} -Xcompiler -static" > econf ${myconf} \ > $(use_enable passwordsave password-save) \ > $(use_enable ssl) \ > $(use_enable ssl crypto) \ >+ $(use_enable lzo) \ > $(use_enable iproute2) \ > --docdir="${EPREFIX}/usr/share/doc/${PF}" > } > > src_compile() { >- >- if use static ; then >- sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed" >- fi >- > emake > > if ! use minimal ; then >- cd plugin >+ cd src/plugins > for i in *; do > [[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue > [[ ${i} == "auth-pam" ]] && ! use pam && continue > einfo "Building ${i} plugin" >- emake -C "${i}" CC=$(tc-getCC) >+ emake -C "${i}" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" > done > cd .. > fi >@@ -87,12 +77,8 @@ src_compile() { > src_install() { > emake DESTDIR="${D}" install > >- # install openvpn-plugin.h >- insinto /usr/include >- doins openvpn-plugin.h >- > # install documentation >- dodoc AUTHORS ChangeLog PORTS README README.IPv6 TODO.IPv6 >+ dodoc AUTHORS ChangeLog PORTS README README.IPv6 > > # Install some helper scripts > keepdir /etc/openvpn >@@ -108,18 +94,12 @@ src_install() { > if use examples ; then > # dodoc does not supportly support directory traversal, #15193 > insinto /usr/share/doc/${PF}/examples >- doins -r sample-{config-files,keys,scripts} contrib >+ doins -r sample contrib > fi > >- # Install plugins and easy-rsa >- doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa > if ! use minimal ; then >- cd easy-rsa/2.0 >- make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa" >- cd ../.. >- > exeinto "/usr/$(get_libdir)/${PN}" >- doexe plugin/*/*.so >+ doexe src/plugins/*/*.so > fi > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 409577
:
306543
|
310325
|
310989
| 311711