We no longer use this.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
name = git
version = 2.38.1
-release = 1
+release = 2
groups = Development/Tools
url = http://git-scm.com/
end
end
- package %{name}-svn
- summary = Git tools for importing Subversion repositories.
- description = %{summary}
-
- requires
- git=%{thisver}
- subversion
- end
-
- files
- %{gitcoredir}/*svn*
- %{mandir}/man1/*svn*
- end
- end
-
package %{name}-cvs
summary = Git tools for importing CVS repositories.
description = %{summary}
+++ /dev/null
-
-Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables.
-
---- subversion-1.9.0/build.conf.rpath
-+++ subversion-1.9.0/build.conf
-@@ -561,7 +561,7 @@ lang = python
- path = subversion/bindings/swig/python/libsvn_swig_py
- libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
- apriconv apr python swig
--link-cmd = $(LINK)
-+link-cmd = $(LINK_LIB)
- install = swig-py-lib
- # need special build rule to include -DSWIGPYTHON
- compile-cmd = $(COMPILE_SWIG_PY)
-@@ -586,7 +586,7 @@ type = swig_lib
- lang = ruby
- path = subversion/bindings/swig/ruby/libsvn_swig_ruby
- libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
--link-cmd = $(LINK) $(SWIG_RB_LIBS)
-+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
- install = swig-rb-lib
- # need special build rule to include
- compile-cmd = $(COMPILE_SWIG_RB)
-diff -uap subversion-1.9.0/Makefile.in.rpath subversion-1.9.0/Makefile.in
---- subversion-1.9.0/Makefile.in.rpath
-+++ subversion-1.9.0/Makefile.in
-@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
- COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
- COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
-
--LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_LIB = $(LINK) $(LT_SO_VERSION)
--LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
--LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
-+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
-+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
-
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
+++ /dev/null
-
-Link executables using -pie, link test executables using -no-install.
-
-diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf
-diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf
-diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf
---- subversion-1.9.0/build.conf.pie
-+++ subversion-1.9.0/build.conf
-@@ -743,7 +743,7 @@ libs = libsvncxxhl libgmock libsvn_subr
- sources = tests/*.cpp
- install = tests
- compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX)
--link-cmd = $(LINK_CXX)
-+link-cmd = $(LINK_TEST_CXX)
-
-
- # ----------------------------------------------------------------------------
-@@ -760,7 +760,7 @@ sources = gmock-gtest-all.cc
- install = tests
- msvc-static = yes
- compile-cmd = $(COMPILE_GMOCK_CXX)
--link-cmd = $(LINK_CXX_LIB)
-+link-cmd = $(LINK_TEST_CXX_LIB)
-
- # ----------------------------------------------------------------------------
- #
-@@ -775,6 +775,7 @@ install = test
- libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
- msvc-static = yes
- undefined-lib-symbols = yes
-+link-cmd = $(LINK_TEST_LIB)
-
- # ----------------------------------------------------------------------------
- # Tests for libsvn_fs_base
-diff -uap subversion-1.9.0/build/generator/gen_base.py.pie subversion-1.9.0/build/generator/gen_base.py
---- subversion-1.9.0/build/generator/gen_base.py.pie
-+++ subversion-1.9.0/build/generator/gen_base.py
-@@ -585,7 +585,7 @@ class TargetLinked(Target):
- self.install = options.get('install')
- self.compile_cmd = options.get('compile-cmd')
- self.sources = options.get('sources', '*.c *.cpp')
-- self.link_cmd = options.get('link-cmd', '$(LINK)')
-+ self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
-
- self.external_lib = options.get('external-lib')
- self.external_project = options.get('external-project')
-@@ -644,6 +644,14 @@ class TargetExe(TargetLinked):
-
- self.msvc_force_static = options.get('msvc-force-static') == 'yes'
-
-+ if self.install in ['test', 'bdb-test', 'sub-test', ]:
-+ self.link_cmd = '$(LINK_TEST)'
-+ elif self.link_cmd == '$(LINK_LIB)':
-+ # Over-ride the default for TargetLinked.
-+ self.link_cmd = '$(LINK_EXE)'
-+ elif self.link_cmd not in ['$(LINK_TEST_CXX)', ]:
-+ raise GenError('ERROR: Unknown executable link type for ' + self.name + ': ' + self.link_cmd)
-+
- def add_dependencies(self):
- TargetLinked.add_dependencies(self)
-
-diff -uap subversion-1.9.0/Makefile.in.pie subversion-1.9.0/Makefile.in
---- subversion-1.9.0/Makefile.in.pie
-+++ subversion-1.9.0/Makefile.in
-@@ -259,6 +259,11 @@ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link
- LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
- LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
-+LINK_TEST = $(LINK) -no-install
-+LINK_TEST_LIB = $(LINK) -avoid-version
-+LINK_TEST_CXX_LIB = $(LINK_CXX) -avoid-version
-+LINK_EXE = $(LINK) -pie
-+LINK_CXX_EXE = $(LINK) -pie
-
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
-@@ -753,10 +758,10 @@ schema-clean:
- $(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@
-
- .c.o:
-- $(COMPILE) -o $@ -c $<
-+ $(COMPILE) -fPIE -o $@ -c $<
-
- .cpp.o:
-- $(COMPILE_CXX) -o $@ -c $<
-+ $(COMPILE_CXX) -fPIE -o $@ -c $<
-
- .c.lo:
- $(LT_COMPILE) -o $@ -c $<
+++ /dev/null
-
-Don't drop -Wall in the swig Perl bindings, otherwise building with
-e.g. -Wformat-security might break.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1037341
-
---- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall
-+++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in
-@@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1
- # SWIG is using C++ style comments in an extern "C" code.
- $cflags =~ s/-ansi\s+//g;
- $cflags =~ s/-std=c89\s+//g;
--$cflags =~ s/-Wall//g;
- $cflags =~ s/-Wunused//g;
- $cflags =~ s/-Wshadow//g;
- $cflags =~ s/-Wstrict-prototypes//g;
+++ /dev/null
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info@ipfire.org> #
-###############################################################################
-
-name = subversion
-version = 1.9.4
-release = 1
-
-groups = Development/Tools
-url = http://subversion.apache.org/
-license = ASL 2.0
-summary = A Modern Concurrent Version Control System.
-
-description
- Subversion is a concurrent version control system which enables one
- or more users to collaborate in developing and maintaining a
- hierarchy of files and directories while keeping a history of all
- changes. Subversion only stores the differences between versions,
- instead of every complete file. Subversion is intended to be a
- compelling replacement for CVS.
-end
-
-source_dl = http://www.apache.org/dist/subversion/
-
-build
- requires
- perl(ExtUtils::MakeMaker)
- perl(ExtUtils::Embed)
- perl-Carp
- autoconf
- apr-util-devel
- automake
- expat-devel
- libapr-devel
- libdb-devel
- perl-devel
- sqlite-devel
- swig
- zlib-devel
- end
-
- configure_options += \
- CPPFLAGS="-P" \
- --disable-mod-activation \
- --disable-static
-
- prepare_cmds
- # Regenerate build system.
- sed -i "/seems to be moved/s/^/#/" build/ltmain.sh &&
- ./autogen.sh
-
- # Fix shebang lines.
- perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
- end
-
- install_cmds
- # Build / Install perl bindings.
- make swig-pl-lib %{PARALLELISMFLAGS}
- make install-swig-pl-lib DESTDIR=%{BUILDROOT}
-
- cd subversion/bindings/swig/perl/native
-
- # Doesn't allow OPTIMIZE="%{CFLAGS}".
- perl Makefile.PL INSTALLDIRS=vendor
- make %{PARALLELISMFLAGS}
- make pure_install PERL_INSTALL_ROOT=%{BUILDROOT}
- end
-end
-
-packages
- package %{name}
-
- package perl-%{name}
- summary = Perl bindings to the Subversion libraries.
- description
- This package includes the Perl bindings to
- the Subversion libraries.
- end
-
- requires
- perl(:MODULE_COMPAT_%{perl_version})
- end
-
- files
- /usr/lib/libsvn_swig_perl-1.so.*
- /usr/lib/perl*/
- end
- end
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
projects / ipfire-3.x.git / commitdiff
