fix jade segfault building with -fno-lifetime-dse (see https://bugs.archlinux.org/task/55331) [release 1.3.2-10mamba;Thu Dec 03 2020]
This commit is contained in:
parent
4de464f73f
commit
0eb89e0b47
22
openjade-1.3.2-perl-getopts.patch
Normal file
22
openjade-1.3.2-perl-getopts.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
--- openjade-1.3.3-pre1/msggen.pl.orig 2015-01-01 18:14:45.187510209 +0000
|
||||||
|
+++ openjade-1.3.3-pre1/msggen.pl 2015-01-01 18:15:15.480842474 +0000
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
# See the file COPYING for copying permission.
|
||||||
|
|
||||||
|
use POSIX;
|
||||||
|
+use Getopt::Std;
|
||||||
|
|
||||||
|
# Package and version.
|
||||||
|
$package = 'openjade';
|
||||||
|
@@ -18,8 +19,9 @@
|
||||||
|
undef $opt_l;
|
||||||
|
undef $opt_p;
|
||||||
|
undef $opt_t;
|
||||||
|
-do 'getopts.pl';
|
||||||
|
-&Getopts('l:p:t:');
|
||||||
|
+#do 'getopts.pl';
|
||||||
|
+#&Getopts('l:p:t:');
|
||||||
|
+getopts('l:p:t:');
|
||||||
|
$module = $opt_l;
|
||||||
|
$pot_file = $opt_p;
|
||||||
|
|
@ -1,20 +1,23 @@
|
|||||||
Name: openjade
|
Name: openjade
|
||||||
Version: 1.3.2
|
Version: 1.3.2
|
||||||
Release: 8mamba
|
Release: 10mamba
|
||||||
Summary: An implementation of DSSSL an ISO standard for formatting SGML
|
Summary: An implementation of DSSSL an ISO standard for formatting SGML
|
||||||
Group: Applications/Publishing
|
Group: Applications/Publishing
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
Distribution: openmamba
|
Distribution: openmamba
|
||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: http://openjade.sourceforge.net/
|
URL: http://openjade.sourceforge.net/
|
||||||
Source: http://heanet.dl.sourceforge.net/sourceforge/openjade/openjade-%{version}.tar.gz
|
Source: http://downloads.sourceforge.net/sourceforge/openjade/openjade-%{version}.tar.gz
|
||||||
|
Patch0: openjade-1.3.2-perl-getopts.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libgcc
|
BuildRequires: libgcc
|
||||||
BuildRequires: libosp-devel
|
BuildRequires: libosp-devel
|
||||||
|
BuildRequires: libnsl-devel
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
|
BuildRequires: sgml-common
|
||||||
Requires: libopenjade = %{version}-%{release}
|
Requires: libopenjade = %{version}-%{release}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
@ -40,36 +43,45 @@ Jade is an implementation of DSSSL -- Document Style Semantics and Specification
|
|||||||
|
|
||||||
This package contains the development files.
|
This package contains the development files.
|
||||||
|
|
||||||
|
%debug_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," config/config.sub
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./configure \
|
%configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
--datadir=%{_datadir}/sgml/openjade-%{version} \
|
--datadir=%{_datadir}/sgml/openjade-%{version} \
|
||||||
--libdir=%{_libdir} \
|
--libdir=%{_libdir} \
|
||||||
--mandir=%{_mandir} \
|
--mandir=%{_mandir} \
|
||||||
--enable-http \
|
--enable-http \
|
||||||
|
--enable-splibdir=%{_libdir} \
|
||||||
--enable-default-catalog=%{_sysconfdir}/sgml/catalog \
|
--enable-default-catalog=%{_sysconfdir}/sgml/catalog \
|
||||||
--enable-default-search-path=%{_datadir}/sgml
|
--enable-default-search-path=%{_datadir}/sgml \
|
||||||
|
CFLAGS="%{optflags} -fno-lifetime-dse" \
|
||||||
|
CXXFLAGS="%{optflags} -fno-lifetime-dse"
|
||||||
|
|
||||||
%make
|
%make
|
||||||
|
|
||||||
%install
|
%install
|
||||||
test x%{buildroot} != x/ && rm -rf %{buildroot}
|
test x%{buildroot} != x/ && rm -rf %{buildroot}
|
||||||
make install \
|
%makeinstall
|
||||||
prefix=%{buildroot}%{_prefix} \
|
|
||||||
datadir=%{buildroot}%{_datadir}/sgml/openjade-%{version} \
|
#prefix=%{buildroot}%{_prefix} \
|
||||||
libdir=%{buildroot}%{_libdir} \
|
# datadir=%{buildroot}%{_datadir}/sgml/openjade-%{version} \
|
||||||
mandir=%{buildroot}%{_mandir} \
|
# libdir=%{buildroot}%{_libdir} \
|
||||||
install-man
|
# mandir=%{buildroot}%{_mandir} \
|
||||||
|
# install-man
|
||||||
|
|
||||||
ln -s openjade %{buildroot}%{_bindir}/jade
|
ln -s openjade %{buildroot}%{_bindir}/jade
|
||||||
ln -s libogrove.so %{buildroot}%{_libdir}/libgrove.so
|
ln -s libogrove.so %{buildroot}%{_libdir}/libgrove.so
|
||||||
ln -s libospgrove.so %{buildroot}%{_libdir}/libspgrove.so
|
ln -s libospgrove.so %{buildroot}%{_libdir}/libspgrove.so
|
||||||
ln -s libostyle.so %{buildroot}%{_libdir}/libstyle.so
|
ln -s libostyle.so %{buildroot}%{_libdir}/libstyle.so
|
||||||
install -m644 dsssl/catalog %{buildroot}%{_datadir}/sgml/openjade-1.3.2/
|
install -m644 dsssl/catalog %{buildroot}%{_datadir}/sgml/openjade-%{version}/
|
||||||
install -m644 dsssl/*.{dtd,dsl,sgm} \
|
install -m644 dsssl/*.{dtd,dsl,sgm} \
|
||||||
%{buildroot}%{_datadir}/sgml/openjade-1.3.2/
|
%{buildroot}%{_datadir}/sgml/openjade-%{version}/
|
||||||
|
|
||||||
install -d %{buildroot}%{_includedir}/sp/{generic,include}
|
install -d %{buildroot}%{_includedir}/sp/{generic,include}
|
||||||
install generic/*.h %{buildroot}%{_includedir}/sp/generic/
|
install generic/*.h %{buildroot}%{_includedir}/sp/generic/
|
||||||
@ -88,6 +100,7 @@ if [ $1 -ge 1 ]; then
|
|||||||
--add %{_sysconfdir}/sgml/sgml-docbook.cat \
|
--add %{_sysconfdir}/sgml/sgml-docbook.cat \
|
||||||
%{_sysconfdir}/sgml/openjade-%{version}.cat
|
%{_sysconfdir}/sgml/openjade-%{version}.cat
|
||||||
fi
|
fi
|
||||||
|
:
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
if [ $1 -eq 0 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
@ -99,29 +112,36 @@ if [ $1 -eq 0 ]; then
|
|||||||
--del %{_sysconfdir}/sgml/sgml-docbook.cat \
|
--del %{_sysconfdir}/sgml/sgml-docbook.cat \
|
||||||
%{_sysconfdir}/sgml/openjade-%{version}.cat 2>/dev/null
|
%{_sysconfdir}/sgml/openjade-%{version}.cat 2>/dev/null
|
||||||
fi
|
fi
|
||||||
|
:
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/jade
|
%{_bindir}/jade
|
||||||
%{_bindir}/openjade
|
%{_bindir}/openjade
|
||||||
%{_mandir}/man1/*
|
%dir %{_datadir}/sgml/openjade-%{version}
|
||||||
|
%{_datadir}/sgml/openjade-%{version}/*
|
||||||
|
#%{_mandir}/man1/*
|
||||||
|
|
||||||
%files -n libopenjade
|
%files -n libopenjade
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
%dir %{_datadir}/sgml/openjade-%{version}
|
%doc COPYING
|
||||||
%{_datadir}/sgml/openjade-%{version}/*
|
|
||||||
|
|
||||||
%files -n libopenjade-devel
|
%files -n libopenjade-devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/*.a
|
%{_libdir}/lib*.a
|
||||||
%{_libdir}/*.la
|
%{_libdir}/lib*.la
|
||||||
%{_libdir}/*.so
|
%{_libdir}/lib*.so
|
||||||
%dir %{_includedir}/sp
|
%dir %{_includedir}/sp
|
||||||
%{_includedir}/sp/*
|
%{_includedir}/sp/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3.2-10mamba
|
||||||
|
- fix jade segfault building with -fno-lifetime-dse (see https://bugs.archlinux.org/task/55331)
|
||||||
|
|
||||||
|
* Fri Nov 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3.2-9mamba
|
||||||
|
- added debug package
|
||||||
|
|
||||||
* Tue Feb 17 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3.2-8mamba
|
* Tue Feb 17 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3.2-8mamba
|
||||||
- automatic rebuild by autodist
|
- automatic rebuild by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user