| 1 |
ulm 08/04/25 14:40:29 |
| 2 |
|
| 3 |
Modified: motif-config-2.3 |
| 4 |
Added: openmotif-2.3.0-freebsd-libiconv.patch |
| 5 |
Log: |
| 6 |
Depend on virtual/libiconv and fix FreeBSD linking problem, bug 219040. |
| 7 |
(Portage version: 2.1.5_rc6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 x11-libs/openmotif/files/motif-config-2.3 |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/motif-config-2.3?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/motif-config-2.3?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/motif-config-2.3?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: motif-config-2.3 |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/files/motif-config-2.3,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- motif-config-2.3 25 Mar 2008 18:05:32 -0000 1.4 |
| 23 |
+++ motif-config-2.3 25 Apr 2008 14:40:28 -0000 1.5 |
| 24 |
@@ -13,43 +13,25 @@ |
| 25 |
Usage: motif-config [option] |
| 26 |
|
| 27 |
Options: |
| 28 |
- -L, --get-lib-path Print path where openmotif libraries are located. |
| 29 |
- -I, --get-inc-path Print path where openmotif includes are located. |
| 30 |
+ -L, --get-lib-path Print path where openmotif libraries are located |
| 31 |
+ -I, --get-inc-path Print path where openmotif includes are located |
| 32 |
--libs Print link flags for openmotif |
| 33 |
--cflags Print compilation flags for openmotif |
| 34 |
USAGE_END |
| 35 |
exit $1 |
| 36 |
} |
| 37 |
|
| 38 |
-get_lib_path() { |
| 39 |
- echo "/usr/@@LIBDIR@@/" |
| 40 |
- exit 0 |
| 41 |
-} |
| 42 |
- |
| 43 |
-get_inc_path() { |
| 44 |
- echo "/usr/include/" |
| 45 |
- exit 0 |
| 46 |
-} |
| 47 |
- |
| 48 |
-get_libs() { |
| 49 |
- echo "-L/usr/@@LIBDIR@@/" |
| 50 |
- exit 0 |
| 51 |
-} |
| 52 |
- |
| 53 |
-get_cflags() { |
| 54 |
- echo "-I/usr/include/" |
| 55 |
- exit 0 |
| 56 |
-} |
| 57 |
- |
| 58 |
[[ $# -lt 1 ]] && usage 1 |
| 59 |
[[ $# -gt 2 ]] && usage 1 |
| 60 |
|
| 61 |
case "$1" in |
| 62 |
- -L|--get-lib-path) get_lib_path ;; |
| 63 |
- -I|--get-inc-path) get_inc_path ;; |
| 64 |
- --libs) get_libs ;; |
| 65 |
- --cflags) get_cflags ;; |
| 66 |
+ -L|--get-lib-path) echo "/usr/@@LIBDIR@@/" ;; |
| 67 |
+ -I|--get-inc-path) echo "/usr/include/" ;; |
| 68 |
+ --libs) echo "-L/usr/@@LIBDIR@@/" ;; |
| 69 |
+ --cflags) echo "-I/usr/include/" ;; |
| 70 |
+ -v|--version) echo "motif-config-2.3" ;; |
| 71 |
-h|--help) usage 0 ;; |
| 72 |
- -v|--version) echo "motif-config-2.3"; exit 0 ;; |
| 73 |
*) usage 1 ;; |
| 74 |
esac |
| 75 |
+ |
| 76 |
+exit 0 |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.1 x11-libs/openmotif/files/openmotif-2.3.0-freebsd-libiconv.patch |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.0-freebsd-libiconv.patch?rev=1.1&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/files/openmotif-2.3.0-freebsd-libiconv.patch?rev=1.1&content-type=text/plain |
| 84 |
|
| 85 |
Index: openmotif-2.3.0-freebsd-libiconv.patch |
| 86 |
=================================================================== |
| 87 |
--- openmotif-2.3.0-orig/configure.ac 2006-12-05 12:53:29.000000000 +0100 |
| 88 |
+++ openmotif-2.3.0/configure.ac 2008-04-24 18:39:42.000000000 +0200 |
| 89 |
@@ -221,7 +221,8 @@ |
| 90 |
if test "$enable_utf8" = "yes" |
| 91 |
then |
| 92 |
AC_DEFINE([UTF8_SUPPORTED], [1], [UTF8 is supported]) |
| 93 |
- AC_CHECK_LIB([iconv], [iconv_open]) |
| 94 |
+ AC_SEARCH_LIBS([iconv_open], [iconv], , |
| 95 |
+ AC_SEARCH_LIBS([libiconv_open], [iconv])) |
| 96 |
fi |
| 97 |
|
| 98 |
AC_FIND_XFT |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
-- |
| 103 |
gentoo-commits@l.g.o mailing list |
Archives