gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/htun: Fix multiple symbol definitions

Browse Source 
Gentoo-bug: 571458
* EAPI=6
* Made PATCHES -p1 compliant
* Respect CFLAGS

Package-Manager: portage-2.3.3
This commit is contained in:
David Seifert
2016-12-12 00:42:50 +01:00
parent dc4c700f8a
commit cddcbd4db4
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-misc/htun/files/htun-0.9.6-glibc.patch
View File

@@ -2,8 +2,8 @@ get things building with glibc-2.8
http://bugs.gentoo.org/248100 http://bugs.gentoo.org/248100
--- include/common.h --- a/include/common.h
+++ include/common.h +++ b/include/common.h
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#ifndef __COMMON_H #ifndef __COMMON_H
#define __COMMON_H #define __COMMON_H

18
net-misc/htun/files/htun-0.9.6-makefile.patch
View File

@@ -1,8 +1,11 @@
--- src/Makefile 2005-10-27 12:58:53.000000000 +0200 * Fix build system to not hardcode CC
+++ src/Makefile 2013-03-08 22:20:52.360922189 +0100 * Fix build system to respect user flags
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,16 +20,14 @@ @@ -20,16 +20,14 @@
# $Id$ # $Id: Makefile,v 2.16 2002/08/11 15:57:07 jehsom Exp $
- -
-CFLAGS = -I../include -I. -O -W -Wall -g -D_REENTRANT #-pg -a -CFLAGS = -I../include -I. -O -W -Wall -g -D_REENTRANT #-pg -a
@@ -20,3 +23,12 @@
LEX = flex LEX = flex
YACC = yacc YACC = yacc
INCLUDE := $(wildcard ../include/*.h) INCLUDE := $(wildcard ../include/*.h)
@@ -52,7 +50,7 @@
$(OBJS): $(INCLUDE)
$(CONFOBS): $(CONFSRC)
- $(CC) $(LEX_CFLAGS) -c $(@:.o=.c)
+ $(CC) $(CFLAGS) $(LEX_CFLAGS) -c $(@:.o=.c)
lex.yy.c: parse.l
$(LEX) $^

23
net-misc/htun/htun-0.9.6.ebuild
View File

@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI=6
inherit eutils readme.gentoo inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
DESCRIPTION="Project to tunnel IP traffic over HTTP" DESCRIPTION="Project to tunnel IP traffic over HTTP"
HOMEPAGE="http://linux.softpedia.com/get/System/Networking/HTun-14751.shtml" HOMEPAGE="http://linux.softpedia.com/get/System/Networking/HTun-14751.shtml"
@@ -19,11 +19,15 @@ KEYWORDS="~amd64 ~x86"
DEPEND="dev-util/yacc" DEPEND="dev-util/yacc"
RDEPEND="" RDEPEND=""
src_prepare() { PATCHES=(
epatch "${FILESDIR}"/${P}-glibc.patch #248100 "${FILESDIR}"/${P}-glibc.patch #248100
epatch "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-makefile.patch
)
epatch_user src_configure() {
# Fix multiple symbol definitions due to
# C99/C11 inline semantics, bug 571458
append-cflags -std=gnu89
} }
src_compile() { src_compile() {
@@ -32,8 +36,11 @@ src_compile() {
src_install() { src_install() {
dosbin src/htund dosbin src/htund
insinto /etc insinto /etc
doins doc/htund.conf doins doc/htund.conf
dodoc doc/* README
local DOCS=( doc/. README )
einstalldocs
readme.gentoo_create_doc readme.gentoo_create_doc
} }