Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb49681' into 'master'
[aarch64] Add multilib patch. Contributes to JB#49681

See merge request mer-core/libcroco!1
  • Loading branch information
xfade committed May 22, 2020
2 parents 1d0b526 + fb4f988 commit ce41bcc
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 3 deletions.
42 changes: 42 additions & 0 deletions rpm/0002-multilib.patch
@@ -0,0 +1,42 @@
--- libcroco-0.6.1/croco-config.in.multilib 2006-03-05 16:57:01.000000000 -0500
+++ libcroco-0.6.1/croco-config.in 2006-05-23 13:54:34.000000000 -0400
@@ -1,10 +1,11 @@
#! /bin/sh

-prefix=@prefix@
-exec_prefix=@exec_prefix@
+name=libcroco-0.6
+prefix=`pkg-config --variable prefix $name`
+exec_prefix=`pkg-config --variable exec_prefix $name`
exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=`pkg-config --variable includedir $name`
+libdir=`pkg-config --variable libdir $name`

usage()
{
@@ -59,7 +60,7 @@
;;

--version)
- echo @VERSION@
+ pkg-config --modversion $name
exit 0
;;

@@ -68,11 +69,11 @@
;;

--cflags)
- echo @CROCO_CFLAGS@ @GLIB2_CFLAGS@ @LIBXML2_CFLAGS@
+ pkg-config --cflags $name
;;

--libs)
- echo @CROCO_LIBS@ @GLIB2_LIBS@ @LIBXML2_LIBS@
+ pkg-config --libs $name
;;

*)

6 changes: 3 additions & 3 deletions rpm/libcroco.spec
Expand Up @@ -6,6 +6,7 @@ License: LGPLv2
Source: http://download.gnome.org/sources/libcroco/0.6/%{name}-%{version}.tar.xz

Patch1: 0001-Disable-gtkdoc.patch
Patch2: 0002-multilib.patch

BuildRequires: pkgconfig
BuildRequires: glib2-devel
Expand All @@ -23,11 +24,10 @@ This package provides the necessary development libraries and include
files to allow you to develop with libcroco.

%prep
%setup -q -n %{name}-%{version}/%{name}
%patch1 -p1
%autosetup -n %{name}-%{version}/%{name} -p1

%build
./autogen.sh --disable-static --prefix=%{_prefix}
./autogen.sh --disable-static --prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"

%install
Expand Down

0 comments on commit ce41bcc

Please sign in to comment.