8
0

Accepting request 320406 from home:Andreas_Schwab:Factory

- Force gnu89 inline semantics
- Disable tests only in QEMU user-space builds
- inline.patch: remove

OBS-URL: https://build.opensuse.org/request/show/320406
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=58
This commit is contained in:
Vítězslav Čížek
2015-08-04 15:24:48 +00:00
committed by Git OBS Bridge
parent c42f7984e2
commit e116fcde56
3 changed files with 9 additions and 15 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 4 08:29:01 UTC 2015 - schwab@suse.de
- Force gnu89 inline semantics
- Disable tests only in QEMU user-space builds
- inline.patch: remove
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 28 14:08:01 UTC 2015 - pgajdos@suse.com Tue Jul 28 14:08:01 UTC 2015 - pgajdos@suse.com

View File

@@ -26,7 +26,6 @@ License: Apache-2.0
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
Url: http://perl.apache.org/ Url: http://perl.apache.org/
Source0: http://apache.miloslavbrada.cz/perl/%{srcname}-%{version}.tar.gz Source0: http://apache.miloslavbrada.cz/perl/%{srcname}-%{version}.tar.gz
Patch0: inline.patch
Patch1: avoid-broken-provides.diff Patch1: avoid-broken-provides.diff
BuildRequires: apache-rpm-macros BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel BuildRequires: apache2-devel
@@ -101,16 +100,15 @@ software depending on apache2-mod_perl.
%prep %prep
%setup -q -n %{srcname}-%{version} %setup -q -n %{srcname}-%{version}
%patch0
%patch1 -p1 %patch1 -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags}" perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline"
make %{?_smp_mflags} make %{?_smp_mflags}
# #
# Run tests # Run tests
# #
%ifnarch %{arm} %if !0%{?qemu_user_space_build}
mkdir t/run mkdir t/run
# workaround for 32-bit where /usr/lib64/apache2-prefork is hardcoded? # workaround for 32-bit where /usr/lib64/apache2-prefork is hardcoded?
cat >> t/conf/extra.conf.in <<-EOF cat >> t/conf/extra.conf.in <<-EOF

View File

@@ -1,11 +0,0 @@
--- src/modules/perl/modperl_common_util.h.orig 2015-06-26 17:41:33.538000834 +0100
+++ src/modules/perl/modperl_common_util.h 2015-06-26 17:42:14.524052878 +0100
@@ -22,7 +22,7 @@
#ifdef MP_DEBUG
#define MP_INLINE
#else
-#define MP_INLINE APR_INLINE
+#define MP_INLINE
#endif
#ifdef CYGWIN