rpms/m17n-lib
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix m17n-config not working on non x86_* archs (rh#921189)

Browse Source
This commit is contained in:
Hans de Goede 2013-03-14 09:25:29 +01:00
parent 8a55c27dcc
commit 5af1bfbf56
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
m17n-lib-1.6.1-multilib.patch
View File

@ -1,6 +1,7 @@
--- m17n-config.in.old 2007-11-22 12:28:52.000000000 +0530 diff -up m17n-lib-1.6.4/m17n-config.in.multi m17n-lib-1.6.4/m17n-config.in
+++ m17n-config.in 2010-07-01 14:35:00.000000000 +0530 --- m17n-lib-1.6.4/m17n-config.in.multi 2012-04-23 02:16:56.000000000 +0200
@@ -64,17 +64,25 @@ else +++ m17n-lib-1.6.4/m17n-config.in 2013-03-14 09:17:32.061122801 +0100
@@ -64,17 +64,15 @@ else
LIBNAME="$LIBNAME$LIBSHELL$LIBFLT$LIBGUI" LIBNAME="$LIBNAME$LIBSHELL$LIBFLT$LIBGUI"
fi fi
@ -17,35 +18,22 @@
- echo "${LIBNAME}" - echo "${LIBNAME}"
- fi;; - fi;;
- -
+ case $platform in + echo "${LIBNAME}";;
+ "i686")
+ echo "${LIBNAME}"
+ ;;
+ "x86_64")
+ echo "-L/usr/lib64 ${LIBNAME}"
+ ;;
+ *)
+ echo "Unknown platform"
+ ;;
+ esac;;
+ +
--cflags) --cflags)
if test "@includedir@" != "/usr/include"; then if test "@includedir@" != "/usr/include"; then
echo "-I@includedir@" echo "-I@includedir@"
@@ -82,7 +90,17 @@ case $1 in @@ -82,7 +80,14 @@ case $1 in
--libtool) --libtool)
for name in $LIBTOOLNAME; do for name in $LIBTOOLNAME; do
- echo -n "@libdir@/lib${name}.la " - echo -n "@libdir@/lib${name}.la "
+ case $platform in + case $platform in
+ "i686") + x86_64|ppc64|s390x|sparc64)
+ echo -n "/usr/lib/lib${name}.la "
+ ;;
+ "x86_64")
+ echo -n "/usr/lib64/lib${name}.la " + echo -n "/usr/lib64/lib${name}.la "
+ ;; + ;;
+ *) + *)
+ echo "Unknown platform" + echo -n "/usr/lib/lib${name}.la "
+ ;; + ;;
+ esac + esac
done; done;

7
m17n-lib.spec
View File

@ -3,7 +3,7 @@
Name: m17n-lib Name: m17n-lib
Version: 1.6.4 Version: 1.6.4
Release: 6%{?dist} Release: 7%{?dist}
Summary: Multilingual text library Summary: Multilingual text library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -59,7 +59,7 @@ Tools to test M17n GUI widget library.
%prep %prep
%setup -q %setup -q
%patch0 -p0 %patch0 -p1
%build %build
%configure --disable-rpath --disable-static %configure --disable-rpath --disable-static
@ -112,6 +112,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/libm17n-gui.so.* %{_libdir}/libm17n-gui.so.*
%changelog %changelog
* Thu Mar 14 2013 Hans de Goede <hdegoede@redhat.com> - 1.6.4-7
- Fix m17n-config not working on non x86_* archs (rh#921189)
* Mon Mar 11 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-6 * Mon Mar 11 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-6
- Resolves:rh#907488 - shell syntax error in m17n-config - Resolves:rh#907488 - shell syntax error in m17n-config