cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on !shared arch; with and ok sthen@

Browse Source
This commit is contained in:
stsp 2013-01-28 15:38:31 +00:00
parent e7df779f8b
commit 9014b21793
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/libircclient/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/01/28 13:49:52 stsp Exp $
# $OpenBSD: Makefile,v 1.2 2013/01/28 15:38:31 stsp Exp $
COMMENT = library which implements the IRC protocol
DISTNAME = libircclient-1.6
REVISION = 0
SHARED_LIBS = ircclient 0.0
CATEGORIES = net
HOMEPAGE = http://www.ulduzsoft.com/linux/libircclient/
@ -17,8 +18,9 @@ WANTLIB = crypto ssl
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libircclient/}
USE_GMAKE = Yes
NO_REGRESS = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-shared \
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.68
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--enable-static \
--enable-openssl \
--enable-ipv6

12
net/libircclient/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2013/01/28 13:49:52 stsp Exp $
--- configure.orig Mon Jan 28 12:32:29 2013
+++ configure Mon Jan 28 12:32:51 2013
@@ -4390,8 +4390,6 @@ fi
if test "$use_debug" = "yes"; then
CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
-else
- CFLAGS="${CFLAGS} -O3"
fi
# Choosing the target

20
net/libircclient/patches/patch-configure_in Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-configure_in,v 1.1 2013/01/28 15:38:31 stsp Exp $
--- configure.in.orig Mon Jan 28 16:04:30 2013
+++ configure.in Mon Jan 28 16:06:54 2013
@@ -62,15 +62,12 @@ AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LI
if test "$use_debug" = "yes"; then
CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
-else
- CFLAGS="${CFLAGS} -O3"
fi
# Choosing the target
TARGET="static"
if test "$build_shared" = "yes"; then
- CFLAGS="$CFLAGS -fpic"
- TARGET="shared"
+ TARGET="static shared"
fi
if test "$use_ipv6" = "yes"; then

14
net/libircclient/patches/patch-src_Makefile_in
View File

@ -1,12 +1,8 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2013/01/28 13:49:52 stsp Exp $
$OpenBSD: patch-src_Makefile_in,v 1.2 2013/01/28 15:38:31 stsp Exp $
--- src/Makefile.in.orig Sun Jan 22 23:13:17 2012
+++ src/Makefile.in Wed Jan 9 16:21:54 2013
@@ -8,13 +8,13 @@ DESTDIR=
OBJS = libircclient.o
-all: @TARGET@
+all: static shared
+++ src/Makefile.in Mon Jan 28 16:12:07 2013
@@ -11,10 +11,10 @@ OBJS = libircclient.o
all: @TARGET@
static: libircclient.a
-shared: libircclient.so
@ -23,7 +19,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2013/01/28 13:49:52 stsp Exp $
cp ../include/libirc_options.h $(DESTDIR)@prefix@/include/libirc_options.h
cp ../include/libirc_rfcnumeric.h $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
- cp libircclient.so $(DESTDIR)@prefix@/lib/
+ cp libircclient.so.$(LIBircclient_VERSION) $(DESTDIR)@prefix@/lib/
+ if test -e libircclient.so.$(LIBircclient_VERSION); then cp libircclient.so.$(LIBircclient_VERSION) $(DESTDIR)@prefix@/lib/; fi
cp libircclient.a $(DESTDIR)@prefix@/lib/
-libircclient.so: libircclient.o