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

- restore custom ltconfig patch so this will build

Browse Source 
- don't clobber CFLAGS
- remove unwarranted gmake dependency
This commit is contained in:
naddy 2001-12-23 18:18:11 +00:00
parent 6a093dc2f2
commit 135d114e1f
2 changed files with 81 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/gii/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2001/11/01 18:38:04 wilfried Exp $
# $OpenBSD: Makefile,v 1.21 2001/12/23 18:18:11 naddy Exp $
# Uses pthreads
COMMENT= "General Input Library (used by libggi)"
DISTNAME= libgii-0.7
CATEGORIES= graphics
NEED_VERSION= 1.475
MASTER_SITES= ftp://metalab.unc.edu/pub/ggi/ggi/2_0_beta_3/
MAINTAINER= Todd T. Fries <todd@openbsd.org>
@ -14,15 +13,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
MASTER_SITES= ftp://metalab.unc.edu/pub/ggi/ggi/2_0_beta_3/
EXTRACT_SUFX= .tar.bz2
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
USE_X11= Yes
USE_GMAKE= Yes
EXTRACT_SUFX= .tar.bz2
CFLAGS+= -pthread
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= CFLAGS=-pthread
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --enable-mutexes="int"

74
graphics/gii/patches/patch-ltconfig Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-ltconfig,v 1.3 2001/12/23 18:18:11 naddy Exp $
--- ltconfig.orig Fri Jun 23 22:04:53 2000
+++ ltconfig Sun Dec 23 19:04:23 2001
@@ -504,7 +504,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1108,7 +1115,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1405,10 +1414,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2030,13 +2053,12 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)