[otf2] Update to 1.4
Orion Poplawski
orion at fedoraproject.org
Tue Jul 15 22:49:09 UTC 2014
commit 82aee5c186f381e5d578941ea144b5c1c29074f5
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Jul 15 16:49:31 2014 -0600
Update to 1.4
- Add patch to allow running autoreconf to remove rpaths
otf2-autoconf.patch | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++
otf2-jinja2.patch | 52 ++-------------
otf2.spec | 49 +++++++++-----
3 files changed, 217 insertions(+), 61 deletions(-)
---
diff --git a/otf2-autoconf.patch b/otf2-autoconf.patch
new file mode 100644
index 0000000..1fffa8d
--- /dev/null
+++ b/otf2-autoconf.patch
@@ -0,0 +1,177 @@
+diff -up otf2-1.4/build-backend/configure.ac.autoconf otf2-1.4/build-backend/configure.ac
+--- otf2-1.4/build-backend/configure.ac.autoconf 2014-05-12 03:47:29.000000000 -0600
++++ otf2-1.4/build-backend/configure.ac 2014-07-15 15:15:35.264741290 -0600
+@@ -37,8 +37,7 @@ AC_SUBST([LIBRARY_INTERFACE_VERSION], m4
+ AC_DEFINE_UNQUOTED([LIBRARY_INTERFACE_VERSION], ["$LIBRARY_INTERFACE_VERSION"], [Interface version number])
+
+ AC_CONFIG_AUX_DIR([../build-config])
+-AC_CONFIG_MACRO_DIR([../build-config/m4
+- ../vendor/common/build-config/m4])
++AC_CONFIG_MACRO_DIR([../build-config/m4])
+
+ AC_CONFIG_HEADERS([../src/config-backend.h])
+ AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes"],
+diff -up otf2-1.4/build-frontend/configure.ac.autoconf otf2-1.4/build-frontend/configure.ac
+--- otf2-1.4/build-frontend/configure.ac.autoconf 2014-05-12 03:47:30.000000000 -0600
++++ otf2-1.4/build-frontend/configure.ac 2014-07-15 15:15:35.264741290 -0600
+@@ -37,8 +37,7 @@ AC_SUBST([LIBRARY_INTERFACE_VERSION], m4
+ AC_DEFINE_UNQUOTED([LIBRARY_INTERFACE_VERSION], ["$LIBRARY_INTERFACE_VERSION"], [Interface version number])
+
+ AC_CONFIG_AUX_DIR([../build-config])
+-AC_CONFIG_MACRO_DIR([../build-config/m4
+- ../vendor/common/build-config/m4])
++AC_CONFIG_MACRO_DIR([../build-config/m4])
+
+ AC_CONFIG_HEADERS([../src/config-frontend.h])
+
+diff -up otf2-1.4/configure.ac.autoconf otf2-1.4/configure.ac
+--- otf2-1.4/configure.ac.autoconf 2014-05-12 03:47:30.000000000 -0600
++++ otf2-1.4/configure.ac 2014-07-15 15:15:35.264741290 -0600
+@@ -45,10 +45,7 @@ AC_SCOREP_TOPLEVEL_ARGS
+ ## in this directory.
+ AC_CONFIG_AUX_DIR([build-config])
+
+-## Packages that use aclocal should declare where local macros can be found
+-## using AC_CONFIG_MACRO_DIR.
+-AC_CONFIG_MACRO_DIR([build-config/m4
+- vendor/common/build-config/m4])
++AC_CONFIG_MACRO_DIR([build-config/m4])
+
+ ## Set the default installation prefix to /opt/otf2 instead of /usr/local
+ AC_PREFIX_DEFAULT([/opt/otf2])
+@@ -130,3 +127,5 @@ AC_CONFIG_FILES(
+ AC_OUTPUT
+
+ AFS_SUMMARY_COLLECT([test "x$ac_scorep_platform_data_provided" != "xyes"])
++
++LT_INIT
+diff -up otf2-1.4/test/OTF2_AnchorFile_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_AnchorFile_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_AnchorFile_test/Makefile.inc.am.autoconf 2014-05-12 03:47:29.000000000 -0600
++++ otf2-1.4/test/OTF2_AnchorFile_test/Makefile.inc.am 2014-07-15 15:15:35.264741290 -0600
+@@ -45,6 +45,6 @@ OTF2_AnchorFile_test_CPPFLAGS = \
+ OTF2_AnchorFile_test_LDADD = libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_AnchorFile_test/run_anchor_file_test.sh
++ ../test/OTF2_AnchorFile_test/run_anchor_file_test.sh
+ EXTRA_DIST += \
+ $(SRC_ROOT)test/OTF2_AnchorFile_test/run_anchor_file_test.sh
+diff -up otf2-1.4/test/OTF2_AttributeList_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_AttributeList_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_AttributeList_test/Makefile.inc.am.autoconf 2014-05-12 03:47:28.000000000 -0600
++++ otf2-1.4/test/OTF2_AttributeList_test/Makefile.inc.am 2014-07-15 15:16:53.586396279 -0600
+@@ -43,6 +43,6 @@ OTF2_AttributeList_test_CPPFLAGS = \
+ -I$(INC_DIR_COMMON_CUTEST)
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_AttributeList_test/run_attribute_list_test.sh
++ ../test/OTF2_AttributeList_test/run_attribute_list_test.sh
+ EXTRA_DIST += \
+ $(SRC_ROOT)test/OTF2_AttributeList_test/run_attribute_list_test.sh
+diff -up otf2-1.4/test/OTF2_Event_Seek_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_Event_Seek_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_Event_Seek_test/Makefile.inc.am.autoconf 2014-05-12 03:47:28.000000000 -0600
++++ otf2-1.4/test/OTF2_Event_Seek_test/Makefile.inc.am 2014-07-15 15:15:35.265741286 -0600
+@@ -40,11 +40,11 @@ OTF2_Event_Seek_test_CPPFLAGS = \
+ OTF2_Event_Seek_test_LDADD = $(LIB_ROOT)libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Event_Seek_test/run_otf2_event_seek_test.sh
++ ../test/OTF2_Event_Seek_test/run_otf2_event_seek_test.sh
+
+ if HAVE_SIONLIB_SUPPORT
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Event_Seek_test/run_otf2_event_seek_test_sion.sh
++ ../test/OTF2_Event_Seek_test/run_otf2_event_seek_test_sion.sh
+ endif
+
+ EXTRA_DIST += \
+diff -up otf2-1.4/test/OTF2_File_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_File_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_File_test/Makefile.inc.am.autoconf 2014-05-12 03:47:29.000000000 -0600
++++ otf2-1.4/test/OTF2_File_test/Makefile.inc.am 2014-07-15 15:15:35.265741286 -0600
+@@ -41,6 +41,6 @@ OTF2_File_test_CPPFLAGS = $(AM_CPPFLAGS)
+ OTF2_File_test_LDADD = libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_File_test/run_otf2_file_test.sh
++ ../test/OTF2_File_test/run_otf2_file_test.sh
+ EXTRA_DIST += \
+ $(SRC_ROOT)test/OTF2_File_test/run_otf2_file_test.sh
+diff -up otf2-1.4/test/OTF2_Integrity_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_Integrity_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_Integrity_test/Makefile.inc.am.autoconf 2014-05-12 03:47:29.000000000 -0600
++++ otf2-1.4/test/OTF2_Integrity_test/Makefile.inc.am 2014-07-15 15:15:35.265741286 -0600
+@@ -43,7 +43,7 @@ SCOREP_TESTS += ./run_otf2_integrity_tes
+
+ if HAVE_SIONLIB_SUPPORT
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Integrity_test/run_otf2_integrity_test_sion.sh
++ ../test/OTF2_Integrity_test/run_otf2_integrity_test_sion.sh
+ SCOREP_XFAIL_TESTS += \
+ $(srcdir)/../test/OTF2_Integrity_test/run_otf2_integrity_test_sion.sh
+ endif
+diff -up otf2-1.4/test/OTF2_Old_Chunk_List_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_Old_Chunk_List_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_Old_Chunk_List_test/Makefile.inc.am.autoconf 2014-05-12 03:47:28.000000000 -0600
++++ otf2-1.4/test/OTF2_Old_Chunk_List_test/Makefile.inc.am 2014-07-15 15:15:35.265741286 -0600
+@@ -44,11 +44,11 @@ OTF2_Old_Chunk_List_test_CPPFLAGS = \
+ OTF2_Old_Chunk_List_test_LDADD = $(LIB_ROOT)libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Old_Chunk_List_test/run_old_chunk_list_test.sh
++ ../test/OTF2_Old_Chunk_List_test/run_old_chunk_list_test.sh
+
+ if HAVE_SIONLIB_SUPPORT
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Old_Chunk_List_test/run_old_chunk_list_test_sion.sh
++ run_old_chunk_list_test_sion.sh
+ endif
+
+ EXTRA_DIST += \
+diff -up otf2-1.4/test/OTF2_Snapshot_Seek_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_Snapshot_Seek_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_Snapshot_Seek_test/Makefile.inc.am.autoconf 2014-05-12 03:47:28.000000000 -0600
++++ otf2-1.4/test/OTF2_Snapshot_Seek_test/Makefile.inc.am 2014-07-15 15:15:35.265741286 -0600
+@@ -22,11 +22,11 @@ OTF2_Snapshot_Seek_test_CPPFLAGS = \
+ OTF2_Snapshot_Seek_test_LDADD = $(LIB_ROOT)libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Snapshot_Seek_test/run_otf2_snapshot_seek_test.sh
++ ../test/OTF2_Snapshot_Seek_test/run_otf2_snapshot_seek_test.sh
+
+ if HAVE_SIONLIB_SUPPORT
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Snapshot_Seek_test/run_otf2_snapshot_seek_test_sion.sh
++ ../test/OTF2_Snapshot_Seek_test/run_otf2_snapshot_seek_test_sion.sh
+ endif
+
+ EXTRA_DIST += \
+diff -up otf2-1.4/test/OTF2_Timer_sync_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_Timer_sync_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_Timer_sync_test/Makefile.inc.am.autoconf 2014-05-12 03:47:29.000000000 -0600
++++ otf2-1.4/test/OTF2_Timer_sync_test/Makefile.inc.am 2014-07-15 15:15:35.265741286 -0600
+@@ -40,11 +40,11 @@ OTF2_Timer_sync_test_CPPFLAGS = \
+ OTF2_Timer_sync_test_LDADD = $(LIB_ROOT)libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Timer_sync_test/run_otf2_timer_sync_test.sh
++ ../test/OTF2_Timer_sync_test/run_otf2_timer_sync_test.sh
+
+ if HAVE_SIONLIB_SUPPORT
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_Timer_sync_test/run_otf2_timer_sync_test_sion.sh
++ ../test/OTF2_Timer_sync_test/run_otf2_timer_sync_test_sion.sh
+ endif
+
+ EXTRA_DIST += \
+diff -up otf2-1.4/test/OTF2_UnknownRecord_test/Makefile.inc.am.autoconf otf2-1.4/test/OTF2_UnknownRecord_test/Makefile.inc.am
+--- otf2-1.4/test/OTF2_UnknownRecord_test/Makefile.inc.am.autoconf 2014-05-12 03:47:28.000000000 -0600
++++ otf2-1.4/test/OTF2_UnknownRecord_test/Makefile.inc.am 2014-07-15 15:15:35.266741282 -0600
+@@ -45,11 +45,11 @@ OTF2_UnknownRecord_test_CPPFLAGS = \
+ OTF2_UnknownRecord_test_LDADD = libotf2.la
+
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_UnknownRecord_test/run_otf2_unknown_record_test.sh
++ ../test/OTF2_UnknownRecord_test/run_otf2_unknown_record_test.sh
+
+ if HAVE_SIONLIB_SUPPORT
+ SCOREP_TESTS += \
+- $(srcdir)/../test/OTF2_UnknownRecord_test/run_otf2_unknown_record_test_sion.sh
++ ../test/OTF2_UnknownRecord_test/run_otf2_unknown_record_test_sion.sh
+ endif
+
+ EXTRA_DIST += \
diff --git a/otf2-jinja2.patch b/otf2-jinja2.patch
index 37df9a3..cbf98d3 100644
--- a/otf2-jinja2.patch
+++ b/otf2-jinja2.patch
@@ -1,47 +1,11 @@
-diff -up otf2-1.2.1/Makefile.in.jinja2 otf2-1.2.1/Makefile.in
---- otf2-1.2.1/Makefile.in.jinja2 2013-09-18 03:34:28.000000000 -0600
-+++ otf2-1.2.1/Makefile.in 2013-10-21 16:17:45.010683280 -0600
-@@ -117,11 +117,7 @@ am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(bindir)" \
-- "$(DESTDIR)$(_markupsafejinja2pythonpkgdatadir)" \
-- "$(DESTDIR)$(jinja2pythonpkgdatadir)" \
- "$(DESTDIR)$(otf2pythonpkgdatadir)" \
-- "$(DESTDIR)$(jinja2eggpythonpkgdatadir)" \
-- "$(DESTDIR)$(jinja2pythonpkgdatadir)" \
- "$(DESTDIR)$(otf2pythonpkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
- SCRIPTS = $(dist_bin_SCRIPTS)
- AM_V_GEN = $(am__v_GEN_$(V))
-@@ -140,8 +136,7 @@ RECURSIVE_TARGETS = all-recursive check-
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
- py_compile = $(top_srcdir)/build-config/py-compile
--DATA = $(jinja2eggpythonpkgdata_DATA) $(jinja2pythonpkgdata_DATA) \
-- $(noinst_DATA) $(otf2pythonpkgdata_DATA) $(pkgdata_DATA)
-+DATA = $(noinst_DATA) $(otf2pythonpkgdata_DATA) $(pkgdata_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -1214,7 +1209,7 @@ check: $(BUILT_SOURCES)
- all-am: Makefile $(SCRIPTS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(_markupsafejinja2pythonpkgdatadir)" "$(DESTDIR)$(jinja2pythonpkgdatadir)" "$(DESTDIR)$(otf2pythonpkgdatadir)" "$(DESTDIR)$(jinja2eggpythonpkgdatadir)" "$(DESTDIR)$(jinja2pythonpkgdatadir)" "$(DESTDIR)$(otf2pythonpkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(otf2pythonpkgdatadir)" "$(DESTDIR)$(otf2pythonpkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: $(BUILT_SOURCES)
-@@ -1267,10 +1262,8 @@ info: info-recursive
+diff -up otf2-1.4/Makefile.am.jinja2 otf2-1.4/Makefile.am
+--- otf2-1.4/Makefile.am.jinja2 2014-05-12 03:47:30.000000000 -0600
++++ otf2-1.4/Makefile.am 2014-07-15 13:58:51.126064624 -0600
+@@ -139,7 +139,6 @@ src/otf2_error_decls.gen.h: $(srcdir)/sh
- info-am:
+ include share/Makefile.inc.am
+ include src/tools/otf2_template/Makefile.inc.am
+-include vendor/python/Makefile.inc.am
--install-data-am: install-_markupsafejinja2pythonpkgdataPYTHON \
-- install-data-local install-jinja2eggpythonpkgdataDATA \
-- install-jinja2pythonpkgdataDATA \
-- install-jinja2pythonpkgdataPYTHON \
-+install-data-am: \
-+ install-data-local \
- install-otf2pythonpkgdataDATA install-otf2pythonpkgdataPYTHON \
- install-pkgdataDATA
+ include templates/Makefile.inc.am
diff --git a/otf2.spec b/otf2.spec
index 4ee4288..60f12f7 100644
--- a/otf2.spec
+++ b/otf2.spec
@@ -1,6 +1,9 @@
+# Needed for el7
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: otf2
-Version: 1.2.1
-Release: 5%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Open Trace Format 2 library
License: BSD
@@ -8,8 +11,12 @@ URL: http://www.vi-hps.org/projects/score-p/
Source0: http://www.vi-hps.org/upload/packages/%{name}/%{name}-%{version}.tar.gz
# Remove jinja2
Patch0: otf2-jinja2.patch
+# Fix AC_CONFIG_MACRO_DIR and remove $(srcdir) from TESTS
+Patch1: otf2-autoconf.patch
BuildRequires: python2-devel
+# For autoreconf, etc.
+BuildRequires: libtool
Requires: python-jinja2
@@ -39,19 +46,21 @@ The %{name}-doc package contains documentation files for %{name}.
%prep
%setup -q
%patch0 -p1 -b .jinja2
-find . -name configure -exec sed -i 's|sys_lib_dlsearch_path_spec=\"/lib /usr/lib $lt_ld_extra\"|sys_lib_dlsearch_path_spec=\"/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra\"|g' '{}' \;
-
+%patch1 -p1 -b .autoconf
+#sed -i -e '/front-and-backend.am/d' ./build-frontend/Makefile.am
# Bundled modified jinja2 in vendor/
rm -rf vendor/python/site-packages
-# Remove setting -rpath in otf2-config
-sed -i -e '/^HARDCODE_INTO_LIBS/s/=.*/=0/' \
- -e '/^HARDCODE_LIBDIR_FLAG_C/s/=.*/=/' */configure
+for d in . build-backend build-frontend
+do
+ cd $d
+ autoreconf -f -i -v
+ cd -
+done
%build
%configure --disable-static --enable-shared --disable-silent-rules \
- --enable-backend-test-runs \
- --with-platform=linux
+ --docdir=%{_pkgdocdir} --enable-backend-test-runs --with-platform=linux
make %{?_smp_mflags}
@@ -71,16 +80,18 @@ make check
%files
%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/%{name}-estimator
%{_bindir}/%{name}-marker
%{_bindir}/%{name}-print
%{_bindir}/%{name}-snapshots
%{_bindir}/%{name}-template
-%{_libdir}/lib%{name}.so.3*
+%{_libdir}/lib%{name}.so.5*
%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/%{name}.summary
%{_datadir}/%{name}/python
-%exclude %{_defaultdocdir}/%{name}/html
-%exclude %{_defaultdocdir}/%{name}/pdf
-%exclude %{_defaultdocdir}/%{name}/tags
+%exclude %{_pkgdocdir}/html
+%exclude %{_pkgdocdir}/pdf
+%exclude %{_pkgdocdir}/tags
%files devel
%{_bindir}/%{name}-config
@@ -89,13 +100,17 @@ make check
%files doc
%doc COPYING
-%dir %{_defaultdocdir}/%{name}
-%{_defaultdocdir}/%{name}/html/
-%{_defaultdocdir}/%{name}/pdf/
-%{_defaultdocdir}/%{name}/tags/
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/html/
+%{_pkgdocdir}/pdf/
+%{_pkgdocdir}/tags/
%changelog
+* Tue Jul 15 2014 Orion Poplawski <orion at cora.nwra.com> - 1.4-1
+- Update to 1.4
+- Add patch to allow running autoreconf to remove rpaths
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list