Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8846e31d7d
!32 fix configure for sw_64
From: @panchenbo 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2023-09-28 03:13:56 +00:00
panchenbo
c08809861b fix configure for sw_64 2023-09-26 16:10:25 +08:00
openeuler-ci-bot
aa56fb76f2
!30 修复riscv64上config.guess问题
From: @laokz 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2023-07-17 02:54:46 +00:00
wujie
ce917e8d79 fix configure for riscv64 and loongarch64 2023-07-05 13:56:21 +08:00
openeuler-ci-bot
8f1e809abf
!25 [sync] PR-24: add PIE compiler options
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-06-06 11:29:23 +00:00
chen-jan
779235cbd0 add PIE compiler options
(cherry picked from commit c47958a01c6d5ff50038f888a230b04845d14c63)
2023-06-06 09:22:25 +08:00
openeuler-ci-bot
69c0cc334e
!17 [sync] PR-16: fix passenger load error
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-09-21 03:07:28 +00:00
starlet-dx
56c7552b49 fix passenger load error
(cherry picked from commit fb3c466fb7092b71be28ce0f5b2edc79c4583961)
2022-09-21 10:09:33 +08:00
openeuler-ci-bot
8c124de928
!9 add BuildRequires: perl to fix build failure
Merge pull request !9 from panxh_purple/openEuler-22.03-LTS-Next
2022-01-25 08:00:17 +00:00
panxiaohe
2fe90227bf add BuildRequires: perl to fix build failure 2022-01-25 10:46:05 +08:00

View File

@ -2,11 +2,14 @@
%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
%{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')}
%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')}
%global passenger_ruby_libdir %{ruby_vendorlibdir}
Name:passenger
Summary: Phusion Passenger application server
Version: 6.0.8
Release: 1
Release: 6
License: Boost and BSD and MIT and zlib
URL: https://www.phusionpassenger.com
@ -19,9 +22,9 @@ Source102: passenger.tmpfiles
Requires: rubygems rubygem(rack) rubygem(rake) ruby(release)
BuildRequires: gcc, gcc-c++ httpd-devel ruby ruby-devel rubygems rubygems-devel
BuildRequires: gcc gcc-c++ httpd-devel ruby ruby-devel rubygems rubygems-devel
BuildRequires: rubygem(rake) >= 0.8.1 rubygem(rack) zlib-devel pcre-devel
BuildRequires: openssl-devel libcurl-devel jsoncpp-devel
BuildRequires: openssl-devel libcurl-devel jsoncpp-devel perl
Provides: bundled(boost) = 1.69.0
@ -75,8 +78,13 @@ This package contains documentation files for Phusion Passenger®.
%autosetup -n %{name}-%{version}
%build
%ifarch loongarch64 sw_64 riscv64
%configure || :
%endif
export EXTRA_CFLAGS="${CFLAGS:-%optflags} -Wno-deprecated"
export EXTRA_CXXFLAGS="${CXXFLAGS:-%optflags} -Wno-deprecated"
export EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -fPIE -pie -fPIC"
export EXTRA_CXX_LDFLAGS="${EXTRA_CXX_LDFLAGS} -fPIE -pie -fPIC"
export EXTRA_CFLAGS=`echo "$EXTRA_CFLAGS" | sed 's|-O2||g'`
export EXTRA_CXXFLAGS=`echo "$EXTRA_CXXFLAGS" | sed 's|-O2||g'`
@ -99,8 +107,8 @@ rake fakeroot \
FS_DATADIR=%{_datadir} \
FS_LIBDIR=%{_libdir} \
FS_DOCDIR=%{_docdir} \
RUBYLIBDIR=%{_datadir}/passenger \
RUBYARCHDIR=%{_libdir}/passenger \
RUBYLIBDIR=%{ruby_vendorlibdir} \
RUBYARCHDIR=%{ruby_vendorarchdir} \
APACHE2_MODULE_PATH=%{_httpd_moddir}/mod_passenger.so
@ -117,6 +125,10 @@ export LC_ALL=en_US.UTF-8
%{__sed} -e 's|@PASSENGERROOT@|%{_datadir}/passenger/phusion_passenger/locations.ini|g' %{SOURCE100} > passenger.conf
%{__sed} -i -e '/^# *Require all granted/d' passenger.conf
./dev/install_scripts_bootstrap_code.rb --ruby %{passenger_ruby_libdir} \
%{buildroot}%{_bindir}/* \
%{buildroot}%{_sbindir}/* \
`find %{buildroot} -name rack_handler.rb`
%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
%{__cat} %{SOURCE101} passenger.conf > passenger-combined.conf
@ -150,7 +162,7 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p
%files
%doc LICENSE CONTRIBUTORS CHANGELOG
%{_bindir}/%{name}*
%{_bindir}/*
%exclude %{_bindir}/%{name}-install-*-module
%{_sbindir}/*
%{_usr}/lib/tmpfiles.d/passenger.conf
@ -166,9 +178,9 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p
%dir %{_localstatedir}/log/passenger-analytics
%dir %attr(755, root, root) %{_localstatedir}/run/passenger-instreg
%{_sysconfdir}/logrotate.d/passenger
%{_datadir}/passenger/*
%{passenger_ruby_libdir}/*
%{_libdir}/passenger/support-binaries
%{_libdir}/passenger/passenger_native_support.so
%{ruby_vendorarchdir}/passenger_native_support.so
%files devel
%{_datadir}/passenger/ngx_http_passenger_module
@ -189,6 +201,21 @@ sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/python3|' %{buildroot}%{_datadir}/p
%{_mandir}/*/*
%changelog
* Tue Aug 15 2023 yangchenguang <yangchenguang@kylinsec.com.cn> - 6.0.8-6
- fix configure for sw_64
* Wed Jul 05 2023 wujie <wujie@nj.iscas.ac.cn> - 6.0.8-5
- fix configure for riscv64 and loongarch64(<huajingyun@loongson.cn>)
* Mon Jun 05 2023 chenchen <chen_aka_jan@163.com> - 6.0.8-4
- add PIE compiler options
* Wed Sep 21 2022 yaoxin <yaoxin30@h-partners.com> - 6.0.8-3
- fix passenger load error
* Tue Jan 25 2022 panxiaohe <panxiaohe@huawei.com> - 6.0.8-2
- add BuildRequires: perl to fix build failure
* Tue Aug 10 2021 yixiangzhike <zhangxingliang3@huawei.com> - 6.0.8-1
- update version to 6.0.8