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

Puke some bits of autofoo to make sure it picks uuid lib from

Browse Source 
sysutils/e2fsprogs and not the one from devel/uuid. Fixes the build when
the latter is installed...
Spotted by Benoit Lecocq, thanks!
This commit is contained in:
landry 2009-03-16 10:46:52 +00:00
parent b0219e37bc
commit 1eca677d3a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/testdisk/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/03/15 20:11:01 landry Exp $
# $OpenBSD: Makefile,v 1.2 2009/03/16 10:46:52 landry Exp $
COMMENT = data recovery software
VERSION = 6.10
DISTNAME = testdisk-${VERSION}
PKGNAME = ${DISTNAME}p0
CATEGORIES = sysutils
HOMEPAGE = http://www.cgsecurity.org/
@ -23,10 +24,11 @@ MODULES = converters/libiconv
SUBST_VARS += VERSION
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib/uuid -L${LOCALBASE}/lib"
LIB_DEPENDS = ext2fs,ext2fs_com_err::sysutils/e2fsprogs,-main \
uuid::sysutils/e2fsprogs,-uuid \
lib/uuid/uuid::sysutils/e2fsprogs,-uuid \
jpeg::graphics/jpeg
WANTLIB = c ncurses z

13
sysutils/testdisk/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/03/15 20:11:01 landry Exp $
$OpenBSD: patch-configure,v 1.2 2009/03/16 10:46:52 landry Exp $
--- configure.orig Thu Jul 17 13:16:30 2008
+++ configure Sat Feb 21 19:37:21 2009
+++ configure Mon Mar 16 11:25:40 2009
@@ -8354,7 +8354,7 @@ if test "${ac_cv_lib_ext2fs_ext2fs_open+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -28,3 +28,12 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/03/15 20:11:01 landry Exp $
else
LIBS="$LIBS ${com_err_lib_a}"
fi
@@ -8950,7 +8950,7 @@ fi
-for ac_header in sys/uuid.h uuid/uuid.h uuid.h
+for ac_header in sys/uuid.h uuid/uuid.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then