Browse Source

musl: fixed conntrack-tools package to build

stable/0.6
Christian Wiese 12 years ago
parent
commit
f4742d5086
  1. 38
      base/musl/pkg/conntrack-tools/0001-disable-rpc-helper.patch
  2. 17
      base/musl/pkg/conntrack-tools/conntrack-tools.conf

38
base/musl/pkg/conntrack-tools/0001-disable-rpc-helper.patch

@ -0,0 +1,38 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/pkg/conntrack-tools/0001-disable-rpc-helper.patch
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# 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.
# --- SDE-COPYRIGHT-NOTE-END ---
disable rpc helper because musl has no rpc headers shipped
--- ./src/helpers/Makefile.am.orig 2013-09-01 01:39:06.221581934 +0200
+++ ./src/helpers/Makefile.am 2013-09-01 01:39:31.610192220 +0200
@@ -1,17 +1,12 @@
include $(top_srcdir)/Make_global.am
pkglib_LTLIBRARIES = ct_helper_ftp.la \
- ct_helper_rpc.la \
ct_helper_tns.la
ct_helper_ftp_la_SOURCES = ftp.c
ct_helper_ftp_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
ct_helper_ftp_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
-ct_helper_rpc_la_SOURCES = rpc.c
-ct_helper_rpc_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
-ct_helper_rpc_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
-
ct_helper_tns_la_SOURCES = tns.c
ct_helper_tns_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
ct_helper_tns_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)

17
base/musl/pkg/conntrack-tools/conntrack-tools.conf

@ -0,0 +1,17 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/pkg/conntrack-tools/conntrack-tools.conf
# Copyright (C) 2013 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
# in musl struct tcphdr is exposed when defining _GNU_SOURCE
var_append CFLAGS ' ' "-D_GNU_SOURCE"
var_append configprefix ' ' 'CFLAGS=$CFLAGS'
Loading…
Cancel
Save