[Midnightbsd-cvs] mports [18211] trunk/devel/liboil: fix liboil build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 17 22:35:15 EDT 2015
Revision: 18211
http://svnweb.midnightbsd.org/mports/?rev=18211
Author: laffer1
Date: 2015-03-17 22:35:15 -0400 (Tue, 17 Mar 2015)
Log Message:
-----------
fix liboil build
Modified Paths:
--------------
trunk/devel/liboil/Makefile
trunk/devel/liboil/distinfo
trunk/devel/liboil/pkg-plist
Added Paths:
-----------
trunk/devel/liboil/files/
trunk/devel/liboil/files/patch-amd64-wavelet.diff
trunk/devel/liboil/files/patch-vec_memcpy.diff
trunk/devel/liboil/files/patch-vec_memset.diff
Modified: trunk/devel/liboil/Makefile
===================================================================
--- trunk/devel/liboil/Makefile 2015-03-18 02:32:52 UTC (rev 18210)
+++ trunk/devel/liboil/Makefile 2015-03-18 02:35:15 UTC (rev 18211)
@@ -3,45 +3,26 @@
PORTNAME= liboil
PORTVERSION= 0.3.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://liboil.freedesktop.org/download/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Library of optimized inner loops
-LICENSE= bsd2
-USE_GNOME= pkgconfig gnomehack ltverhack
-USE_AUTOTOOLS= libtool
+LICENSE= bsd2 bsd3 mit
+LICENSE_COMB= multi
+
+USES= libtool pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--disable-glib
-CFLAGS+= -O2
+INSTALL_TARGET= install-strip
+CFLAGS:= ${CFLAGS:N-O*} -O2
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_3DNOW_GCC40)
-USE_GCC= 4.2+
-.endif
-
-pre-everything::
-.if ${MACHINE_CPU:M3dnow}!=""
-.if !defined(WITH_3DNOW_GCC40)
- @${ECHO_MSG} "You can enable 3dnow extensions by defining"
- @${ECHO_MSG} "WITH_3DNOW_GCC40=yes"
-.endif
- @${ECHO_MSG} ""
- @${ECHO_MSG} "Note: ${PORTNAME} will depend on gcc4.0+ with WITH_3DNOW_GCC40"
- @${ECHO_MSG} "defined."
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|\\$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|<stdint\.h|<inttypes.h|g' \
- ${WRKSRC}/liboil/liboiltypes.h \
- ${WRKSRC}/liboil/liboilprofile.h \
- ${WRKSRC}/liboil/liboil.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/devel/liboil/distinfo
===================================================================
--- trunk/devel/liboil/distinfo 2015-03-18 02:32:52 UTC (rev 18210)
+++ trunk/devel/liboil/distinfo 2015-03-18 02:35:15 UTC (rev 18211)
@@ -1,3 +1,2 @@
SHA256 (liboil-0.3.17.tar.gz) = 105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69
-RMD160 (liboil-0.3.17.tar.gz) = de286350687a5d49868b0a45d4db007526220fec
SIZE (liboil-0.3.17.tar.gz) = 912563
Added: trunk/devel/liboil/files/patch-amd64-wavelet.diff
===================================================================
--- trunk/devel/liboil/files/patch-amd64-wavelet.diff (rev 0)
+++ trunk/devel/liboil/files/patch-amd64-wavelet.diff 2015-03-18 02:35:15 UTC (rev 18211)
@@ -0,0 +1,11 @@
+--- liboil/amd64/wavelet.c.orig 2008-09-26 00:36:18.000000000 +0200
++++ liboil/amd64/wavelet.c 2013-10-24 18:10:54.000000000 +0200
+@@ -1753,7 +1753,7 @@
+ [s3_8] "+r" (s3_8),
+ [d] "+r" (d),
+ [n] "+m" (n),
+- [s1] "+r" ((long)(s1))
++ [s1] "+r" (s1)
+ : [sstr] "r" ((long)(sstr2))
+ );
+ }
Property changes on: trunk/devel/liboil/files/patch-amd64-wavelet.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/liboil/files/patch-vec_memcpy.diff
===================================================================
--- trunk/devel/liboil/files/patch-vec_memcpy.diff (rev 0)
+++ trunk/devel/liboil/files/patch-vec_memcpy.diff 2015-03-18 02:35:15 UTC (rev 18211)
@@ -0,0 +1,42 @@
+--- liboil/motovec/vec_memcpy.S 2007-11-15 18:53:47.000000000 -0800
++++ liboil/motovec/vec_memcpy.S 2009-03-20 20:07:55.000000000 -0700
+@@ -249,9 +249,11 @@
+ memcpy:
+ #else
+ .globl vec_memmove
++ .type vec_memmove, @function
+ vec_memmove:
+ nop // IU1 Only way I know to preserve both labels
+ .globl _vec_memcpy
++ .type _vec_memcpy, @function
+ _vec_memcpy:
+ #endif
+ subf. DMS,SRC,DST // IU1 Compute dst-src difference
+@@ -291,7 +293,9 @@
+ stbu Rt,-1(DBC) // LSU Store it
+ bdnz Byte_cpy_bwd
+ blr
+-
++ .size vec_memmove, . - vec_memmove
++ .size _vec_memcpy, . - _vec_memcpy
++
+ #ifdef __MWERKS__
+ .align 16
+ #else
+@@ -863,6 +867,7 @@
+ bcopy:
+ #else
+ .globl vec_bcopy
++ .type vec_bcopy, @function
+ vec_bcopy:
+ #endif
+ mr Rt,DST // temp storage for what is really source address (r3)
+@@ -871,6 +876,7 @@
+ #ifdef LIBMOTOVEC
+ b memcpy // b to memcpy with correct args in r3 and r4
+ #else
+- b _vec_memcpy // b to vec_memcpy with correct args in r3 and r4
++ b _vec_memcpy at plt // b to vec_memcpy with correct args in r3 and r4
+ #endif
++ .size vec_bcopy, . - vec_bcopy
+ // End of bcopy in AltiVec
Property changes on: trunk/devel/liboil/files/patch-vec_memcpy.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/liboil/files/patch-vec_memset.diff
===================================================================
--- trunk/devel/liboil/files/patch-vec_memset.diff (rev 0)
+++ trunk/devel/liboil/files/patch-vec_memset.diff 2015-03-18 02:35:15 UTC (rev 18211)
@@ -0,0 +1,37 @@
+--- liboil/motovec/vec_memset.S 2007-11-15 18:53:47.000000000 -0800
++++ liboil/motovec/vec_memset.S 2009-03-20 20:10:56.000000000 -0700
+@@ -142,6 +142,7 @@
+ memset:
+ #else
+ .globl _vec_memset
++ .type _vec_memset, @function
+ _vec_memset:
+ #endif
+
+@@ -161,6 +162,7 @@
+ bdnz Byte_set
+
+ blr
++ .size _vec_memset, . - _vec_memset
+
+ v_memset:
+ // Byte count < MIN_VEC bytes will have been set by scalar code above,
+@@ -347,6 +349,7 @@
+ bzero:
+ #else
+ .globl vec_bzero
++ .type vec_bzero, @function
+ vec_bzero:
+ #endif
+
+@@ -355,8 +358,9 @@
+ #ifdef LIBMOTOVEC
+ b memset
+ #else
+- b _vec_memset
++ b _vec_memset at plt
+ #endif
++ .size vec_bzero, . - vec_bzero
+
+ // cacheable_memzero will employ dcbz to clear 32 bytes at a time
+ // of cacheable memory. Like bzero, second entering argument will be BC.
Property changes on: trunk/devel/liboil/files/patch-vec_memset.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/liboil/pkg-plist
===================================================================
--- trunk/devel/liboil/pkg-plist 2015-03-18 02:32:52 UTC (rev 18210)
+++ trunk/devel/liboil/pkg-plist 2015-03-18 02:35:15 UTC (rev 18211)
@@ -17,9 +17,9 @@
include/liboil-0.3/liboil/liboiltypes.h
include/liboil-0.3/liboil/liboilutils.h
lib/liboil-0.3.a
-lib/liboil-0.3.la
lib/liboil-0.3.so
lib/liboil-0.3.so.0
+lib/liboil-0.3.so.0.3.0
libdata/pkgconfig/liboil-0.3.pc
share/gtk-doc/html/liboil/ch01.html
share/gtk-doc/html/liboil/ch02.html
@@ -53,8 +53,3 @@
share/gtk-doc/html/liboil/right.png
share/gtk-doc/html/liboil/style.css
share/gtk-doc/html/liboil/up.png
- at dirrm share/gtk-doc/html/liboil
- at dirrmtry share/gtk-doc/html
- at dirrmtry share/gtk-doc
- at dirrm include/liboil-0.3/liboil
- at dirrm include/liboil-0.3
More information about the Midnightbsd-cvs
mailing list