mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

archivers/liborange: Unbreak port by working around configure flaw

Browse Source 
The configure error "Not configured with libgsf or libole2 but that's
needed for MSI support" is caused by using the wrong configure option
of MSI that was introduced in last commit.

Changing to MSI_CONFIGURE_ENABLE=libgsf to MSI_CONFIGURE_WITH=libgsf
should have solved the problem, but unfortunately there is a logic
flaw in the configure script.  If --without-libgsf is passed to it,
it mistakenly tries to find it anyway with pkgconfig and then fails.

The way to fix this properly is to patch the configure script, but I am
going to cheat by making libgsf an unconditional requirement as it was
before adamw fixed the options reversal.
This commit is contained in:
John Marino 2014-07-16 22:21:55 +00:00
parent 214b03b3c8
commit 5b071f7d0f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=362115
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archivers/liborange/Makefile
View File

@ -3,13 +3,14 @@
PORTNAME= liborange
PORTVERSION= 0.4
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= archivers
MASTER_SITES= SF/synce/Orange/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library to extract CAB files from self-extracting installers
LIB_DEPENDS= libgsf-1.so:${PORTSDIR}/devel/libgsf
RUN_DEPENDS= cabextract:${PORTSDIR}/archivers/cabextract \
unzip:${PORTSDIR}/archivers/unzip
@ -25,9 +26,11 @@ MSI_DESC= Build with expermential MSI support
GNU_CONFIGURE= yes
USES= iconv libtool pathfix pkgconfig
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib -lgsf-1
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --with-libgsf
LIBSYNCE_LIB_DEPENDS= libsynce.so:${PORTSDIR}/palm/synce-libsynce
LIBSYNCE_CONFIGURE_WITH= libsynce
@ -41,8 +44,7 @@ INNO_CONFIGURE_ENABLE= inno
VISE_CONFIGURE_ENABLE= vise
MSI_LIB_DEPENDS= libgsf-1.so.114:${PORTSDIR}/devel/libgsf
MSI_CONFIGURE_ENABLE= msi libgsf
MSI_CONFIGURE_ENABLE= msi
.include <bsd.port.options.mk>