[Likwid-commit] [likwid] 02/10: adapt patches, changelog, control and copyright to new release
Christoph Martin
chrism at debian.org
Wed Jun 22 08:28:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
chrism pushed a commit to branch master
in repository likwid.
commit ecd5d464b843ffebe98e09b0b8944085b97abe5b
Author: Christoph Martin <martin at uni-mainz.de>
Date: Wed Jun 15 18:40:13 2016 +0200
adapt patches, changelog, control and copyright to new release
---
debian/changelog | 7 +
debian/control | 6 +-
debian/copyright | 54 +++----
debian/docs | 2 +-
debian/likwid.lintian-overrides | 6 +-
debian/likwid.symbols | 272 +++++++++++++++++++++++++++++++++-
debian/patches/02-man-pages-fix.patch | 15 +-
debian/patches/08-no-stream.patch | 37 ++---
debian/patches/10-debianize.patch | 240 +++++++++++++++++++++---------
debian/patches/series | 8 +-
debian/rules | 7 +-
11 files changed, 506 insertions(+), 148 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 50c5120..26daab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+likwid (4.1.0+dfsg1-1) UNRELEASED; urgency=medium
+
+ * update watch file for uscan
+ * Imported Upstream version 4.1.0+dfsg1
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de> Wed, 15 Jun 2016 18:27:21 +0200
+
likwid (3.1.3+dfsg1-1) unstable; urgency=medium
* source repack to remove non DFSG files
diff --git a/debian/control b/debian/control
index 0d4ff90..2e76718 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: likwid
-Maintainer: Christoph Martin <martin at uni-mainz.de>
+Maintainer: Christoph Martin <christoph.martin at uni-mainz.de>
Section: misc
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gfortran
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gfortran, liblua5.2-dev
Homepage: http://code.google.com/p/likwid/wiki/Introduction
Vcs-Git: git://anonscm.debian.org/likwid/likwid.git
Vcs-Browser: http://anonscm.debian.org/cgit/likwid/likwid.git;a=summary
@@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/likwid/likwid.git;a=summary
Package: likwid
Architecture: any
Pre-Depends: multiarch-support, ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, lua5.2
Description: toolsuite for performance oriented programmers
Likwid is a simple to install and use toolsuite of command line applications
for performance oriented programmers. It works for Intel and AMD processors
diff --git a/debian/copyright b/debian/copyright
index c4b2fcc..f35195f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: likwid
Source: http://ftp.fau.de/pub/likwid/
-Files-Excluded: test/stream.c
+Files-Excluded: test/stream*
Files: *
Copyright: 2014 Jan Treibig (jt), jan.treibig at gmail.com
@@ -33,30 +33,6 @@ Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
License: LGPL-2+
The license can be found in /usr/share/common-licenses/LGPL-2.
-Files: perl/Template.pm perl/Template/*
-Copyright: 1996-2009 Andy Wardley
-License: GPL-1+ or Artistic
- Copyright (C) 1996-2009 Andy Wardley. All Rights Reserved.
- .
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1' and
- the Artistic Licence in `/usr/share/common-licenses/Artistic'.
-
-Files: perl/Parse/*
-Copyright: 1997-2007, Damian Conway <DCONWAY at CPAN.org>
-License: GPL-1+ or Artistic
- Copyright (c) 1997-2007, Damian Conway <DCONWAY at CPAN.org>. All rights reserved.
- .
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1' and
- the Artistic Licence in `/usr/share/common-licenses/Artistic'.
-
Files: perl/xmgrace.pm
Copyright: 2011, Jan Treibig <jan.treibig at googlemail.com>
License: GPL-2+
@@ -86,3 +62,31 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+Files: ext/hwloc/*
+Copyright: 2009 CNRS
+ 2009 inria. All rights reserved.
+ 2009 Université Bordeaux 1
+ 2009 Cisco Systems, Inc. All rights reserved.
+ 2012 Blue Brain Project, EPFL. All rights reserved.
+License: hwloc
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/docs b/debian/docs
index e845566..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/likwid.lintian-overrides b/debian/likwid.lintian-overrides
index 633bd56..66c14db 100644
--- a/debian/likwid.lintian-overrides
+++ b/debian/likwid.lintian-overrides
@@ -1,3 +1,5 @@
# We want to include the library in the main package
-likwid: package-name-doesnt-match-sonames liblikwidpin3
-likwid: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/liblikwidpin.so.3.1 usr/lib/x86_64-linux-gnu/liblikwidpin.so
+likwid: package-name-doesnt-match-sonames liblikwid-hwloc4.1 liblikwid4.1 liblikwidpin4.1
+likwid: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/liblikwidpin.so.4.1 usr/lib/x86_64-linux-gnu/liblikwidpin.so
+likwid: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/liblikwid-hwloc.so.4.1 usr/lib/x86_64-linux-gnu/liblikwid-hwloc.so
+likwid: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/liblikwid.so.4.1 usr/lib/x86_64-linux-gnu/liblikwid.so
diff --git a/debian/likwid.symbols b/debian/likwid.symbols
index 7ed7a6e..fe47914 100644
--- a/debian/likwid.symbols
+++ b/debian/likwid.symbols
@@ -1,2 +1,270 @@
-liblikwidpin.so.3 likwid #MINVER#
- pthread_create at Base 3.1.2
+liblikwid-hwloc.so.4.1 likwid #MINVER#
+ hwloc_fake_component at Base 4.1.0
+ likwid_hwloc__insert_object_by_cpuset at Base 4.1.0
+ likwid_hwloc_add_children_sets at Base 4.1.0
+ likwid_hwloc_alloc at Base 4.1.0
+ likwid_hwloc_alloc_membind at Base 4.1.0
+ likwid_hwloc_alloc_membind_nodeset at Base 4.1.0
+ likwid_hwloc_backend_alloc at Base 4.1.0
+ likwid_hwloc_backend_enable at Base 4.1.0
+ likwid_hwloc_backends_get_obj_cpuset at Base 4.1.0
+ likwid_hwloc_backends_notify_new_object at Base 4.1.0
+ likwid_hwloc_bitmap_allbut at Base 4.1.0
+ likwid_hwloc_bitmap_alloc at Base 4.1.0
+ likwid_hwloc_bitmap_alloc_full at Base 4.1.0
+ likwid_hwloc_bitmap_and at Base 4.1.0
+ likwid_hwloc_bitmap_andnot at Base 4.1.0
+ likwid_hwloc_bitmap_asprintf at Base 4.1.0
+ likwid_hwloc_bitmap_clr at Base 4.1.0
+ likwid_hwloc_bitmap_clr_range at Base 4.1.0
+ likwid_hwloc_bitmap_compare at Base 4.1.0
+ likwid_hwloc_bitmap_compare_first at Base 4.1.0
+ likwid_hwloc_bitmap_compare_inclusion at Base 4.1.0
+ likwid_hwloc_bitmap_copy at Base 4.1.0
+ likwid_hwloc_bitmap_dup at Base 4.1.0
+ likwid_hwloc_bitmap_fill at Base 4.1.0
+ likwid_hwloc_bitmap_first at Base 4.1.0
+ likwid_hwloc_bitmap_free at Base 4.1.0
+ likwid_hwloc_bitmap_from_ith_ulong at Base 4.1.0
+ likwid_hwloc_bitmap_from_ulong at Base 4.1.0
+ likwid_hwloc_bitmap_intersects at Base 4.1.0
+ likwid_hwloc_bitmap_isequal at Base 4.1.0
+ likwid_hwloc_bitmap_isfull at Base 4.1.0
+ likwid_hwloc_bitmap_isincluded at Base 4.1.0
+ likwid_hwloc_bitmap_isset at Base 4.1.0
+ likwid_hwloc_bitmap_iszero at Base 4.1.0
+ likwid_hwloc_bitmap_last at Base 4.1.0
+ likwid_hwloc_bitmap_list_asprintf at Base 4.1.0
+ likwid_hwloc_bitmap_list_snprintf at Base 4.1.0
+ likwid_hwloc_bitmap_list_sscanf at Base 4.1.0
+ likwid_hwloc_bitmap_next at Base 4.1.0
+ likwid_hwloc_bitmap_not at Base 4.1.0
+ likwid_hwloc_bitmap_only at Base 4.1.0
+ likwid_hwloc_bitmap_or at Base 4.1.0
+ likwid_hwloc_bitmap_set at Base 4.1.0
+ likwid_hwloc_bitmap_set_ith_ulong at Base 4.1.0
+ likwid_hwloc_bitmap_set_range at Base 4.1.0
+ likwid_hwloc_bitmap_singlify at Base 4.1.0
+ likwid_hwloc_bitmap_snprintf at Base 4.1.0
+ likwid_hwloc_bitmap_sscanf at Base 4.1.0
+ likwid_hwloc_bitmap_taskset_asprintf at Base 4.1.0
+ likwid_hwloc_bitmap_taskset_snprintf at Base 4.1.0
+ likwid_hwloc_bitmap_taskset_sscanf at Base 4.1.0
+ likwid_hwloc_bitmap_to_ith_ulong at Base 4.1.0
+ likwid_hwloc_bitmap_to_ulong at Base 4.1.0
+ likwid_hwloc_bitmap_weight at Base 4.1.0
+ likwid_hwloc_bitmap_xor at Base 4.1.0
+ likwid_hwloc_bitmap_zero at Base 4.1.0
+ likwid_hwloc_compare_types at Base 4.1.0
+ likwid_hwloc_free at Base 4.1.0
+ likwid_hwloc_get_api_version at Base 4.1.0
+ likwid_hwloc_get_area_membind at Base 4.1.0
+ likwid_hwloc_get_area_membind_nodeset at Base 4.1.0
+ likwid_hwloc_get_closest_objs at Base 4.1.0
+ likwid_hwloc_get_cpubind at Base 4.1.0
+ likwid_hwloc_get_depth_type at Base 4.1.0
+ likwid_hwloc_get_largest_objs_inside_cpuset at Base 4.1.0
+ likwid_hwloc_get_last_cpu_location at Base 4.1.0
+ likwid_hwloc_get_membind at Base 4.1.0
+ likwid_hwloc_get_membind_nodeset at Base 4.1.0
+ likwid_hwloc_get_nbobjs_by_depth at Base 4.1.0
+ likwid_hwloc_get_obj_by_depth at Base 4.1.0
+ likwid_hwloc_get_proc_cpubind at Base 4.1.0
+ likwid_hwloc_get_proc_last_cpu_location at Base 4.1.0
+ likwid_hwloc_get_proc_membind at Base 4.1.0
+ likwid_hwloc_get_proc_membind_nodeset at Base 4.1.0
+ likwid_hwloc_get_thread_cpubind at Base 4.1.0
+ likwid_hwloc_get_type_depth at Base 4.1.0
+ likwid_hwloc_hide_errors at Base 4.1.0
+ likwid_hwloc_insert_object_by_cpuset at Base 4.1.0
+ likwid_hwloc_insert_object_by_parent at Base 4.1.0
+ likwid_hwloc_insert_pci_device_list at Base 4.1.0
+ likwid_hwloc_linux_get_tid_cpubind at Base 4.1.0
+ likwid_hwloc_linux_get_tid_last_cpu_location at Base 4.1.0
+ likwid_hwloc_linux_parse_cpumap_file at Base 4.1.0
+ likwid_hwloc_linux_set_tid_cpubind at Base 4.1.0
+ likwid_hwloc_obj_add_info at Base 4.1.0
+ likwid_hwloc_obj_add_other_obj_sets at Base 4.1.0
+ likwid_hwloc_obj_attr_snprintf at Base 4.1.0
+ likwid_hwloc_obj_cpuset_snprintf at Base 4.1.0
+ likwid_hwloc_obj_snprintf at Base 4.1.0
+ likwid_hwloc_obj_type_of_string at Base 4.1.0
+ likwid_hwloc_obj_type_snprintf at Base 4.1.0
+ likwid_hwloc_obj_type_sscanf at Base 4.1.0
+ likwid_hwloc_obj_type_string at Base 4.1.0
+ likwid_hwloc_pci_find_cap at Base 4.1.0
+ likwid_hwloc_pci_find_linkspeed at Base 4.1.0
+ likwid_hwloc_pci_prepare_bridge at Base 4.1.0
+ likwid_hwloc_report_os_error at Base 4.1.0
+ likwid_hwloc_set_area_membind at Base 4.1.0
+ likwid_hwloc_set_area_membind_nodeset at Base 4.1.0
+ likwid_hwloc_set_cpubind at Base 4.1.0
+ likwid_hwloc_set_membind at Base 4.1.0
+ likwid_hwloc_set_membind_nodeset at Base 4.1.0
+ likwid_hwloc_set_proc_cpubind at Base 4.1.0
+ likwid_hwloc_set_proc_membind at Base 4.1.0
+ likwid_hwloc_set_proc_membind_nodeset at Base 4.1.0
+ likwid_hwloc_set_thread_cpubind at Base 4.1.0
+ likwid_hwloc_topology_alloc_group_object at Base 4.1.0
+ likwid_hwloc_topology_check at Base 4.1.0
+ likwid_hwloc_topology_destroy at Base 4.1.0
+ likwid_hwloc_topology_diff_apply at Base 4.1.0
+ likwid_hwloc_topology_diff_build at Base 4.1.0
+ likwid_hwloc_topology_diff_destroy at Base 4.1.0
+ likwid_hwloc_topology_dup at Base 4.1.0
+ likwid_hwloc_topology_export_synthetic at Base 4.1.0
+ likwid_hwloc_topology_get_depth at Base 4.1.0
+ likwid_hwloc_topology_get_flags at Base 4.1.0
+ likwid_hwloc_topology_get_support at Base 4.1.0
+ likwid_hwloc_topology_get_userdata at Base 4.1.0
+ likwid_hwloc_topology_ignore_all_keep_structure at Base 4.1.0
+ likwid_hwloc_topology_ignore_type at Base 4.1.0
+ likwid_hwloc_topology_ignore_type_keep_structure at Base 4.1.0
+ likwid_hwloc_topology_init at Base 4.1.0
+ likwid_hwloc_topology_insert_group_object at Base 4.1.0
+ likwid_hwloc_topology_insert_misc_object at Base 4.1.0
+ likwid_hwloc_topology_is_thissystem at Base 4.1.0
+ likwid_hwloc_topology_load at Base 4.1.0
+ likwid_hwloc_topology_restrict at Base 4.1.0
+ likwid_hwloc_topology_set_distance_matrix at Base 4.1.0
+ likwid_hwloc_topology_set_flags at Base 4.1.0
+ likwid_hwloc_topology_set_pid at Base 4.1.0
+ likwid_hwloc_topology_set_synthetic at Base 4.1.0
+ likwid_hwloc_topology_set_userdata at Base 4.1.0
+ likwid_hwloc_topology_set_xml at Base 4.1.0
+ likwid_hwloc_topology_set_xmlbuffer at Base 4.1.0
+liblikwid.so.4.1 likwid #MINVER#
+ HPMaddThread at Base 4.1.0
+ HPMfinalize at Base 4.1.0
+ HPMinit at Base 4.1.0
+ HPMmode at Base 4.1.0
+ _loadData at Base 4.1.0
+ affinity_finalize at Base 4.1.0
+ affinity_init at Base 4.1.0
+ affinity_pinProcess at Base 4.1.0
+ affinity_pinProcesses at Base 4.1.0
+ affinity_pinThread at Base 4.1.0
+ affinity_processGetProcessorId at Base 4.1.0
+ affinity_threadGetProcessorId at Base 4.1.0
+ config_setGroupPath at Base 4.1.0
+ cpuFeatures_disable at Base 4.1.0
+ cpuFeatures_enable at Base 4.1.0
+ cpuFeatures_get at Base 4.1.0
+ cpuFeatures_init at Base 4.1.0
+ cpuFeatures_name at Base 4.1.0
+ cpuFeatures_print at Base 4.1.0
+ cpustr_to_cpulist at Base 4.1.0
+ destroy_configuration at Base 4.1.0
+ get_affinityDomains at Base 4.1.0
+ get_configuration at Base 4.1.0
+ get_cpuInfo at Base 4.1.0
+ get_cpuTopology at Base 4.1.0
+ get_numaTopology at Base 4.1.0
+ get_powerInfo at Base 4.1.0
+ init_configuration at Base 4.1.0
+ likwid_getNumberOfNodes at Base 4.1.0
+ likwid_getProcessorId at Base 4.1.0
+ likwid_markerClose at Base 4.1.0
+ likwid_markerGetRegion at Base 4.1.0
+ likwid_markerInit at Base 4.1.0
+ likwid_markerNextGroup at Base 4.1.0
+ likwid_markerRegisterRegion at Base 4.1.0
+ likwid_markerStartRegion at Base 4.1.0
+ likwid_markerStopRegion at Base 4.1.0
+ likwid_markerThreadInit at Base 4.1.0
+ likwid_markerclose_ at Base 4.1.0
+ likwid_markergetregion_ at Base 4.1.0
+ likwid_markerinit_ at Base 4.1.0
+ likwid_markernextgroup_ at Base 4.1.0
+ likwid_markerregisterregion_ at Base 4.1.0
+ likwid_markerstartregion_ at Base 4.1.0
+ likwid_markerstopregion_ at Base 4.1.0
+ likwid_markerthreadinit_ at Base 4.1.0
+ likwid_pinProcess at Base 4.1.0
+ likwid_pinThread at Base 4.1.0
+ luaopen_liblikwid at Base 4.1.0
+ memsweep_domain at Base 4.1.0
+ memsweep_threadGroup at Base 4.1.0
+ nodestr_to_nodelist at Base 4.1.0
+ numa_finalize at Base 4.1.0
+ numa_init at Base 4.1.0
+ numa_membind at Base 4.1.0
+ numa_setInterleaved at Base 4.1.0
+ perfmon_addEventSet at Base 4.1.0
+ perfmon_destroyMarkerResults at Base 4.1.0
+ perfmon_finalize at Base 4.1.0
+ perfmon_getCountOfRegion at Base 4.1.0
+ perfmon_getCounterName at Base 4.1.0
+ perfmon_getCpulistOfRegion at Base 4.1.0
+ perfmon_getEventName at Base 4.1.0
+ perfmon_getEventsOfRegion at Base 4.1.0
+ perfmon_getGroupInfoLong at Base 4.1.0
+ perfmon_getGroupInfoShort at Base 4.1.0
+ perfmon_getGroupName at Base 4.1.0
+ perfmon_getGroupOfRegion at Base 4.1.0
+ perfmon_getGroups at Base 4.1.0
+ perfmon_getIdOfActiveGroup at Base 4.1.0
+ perfmon_getLastMetric at Base 4.1.0
+ perfmon_getLastResult at Base 4.1.0
+ perfmon_getLastTimeOfGroup at Base 4.1.0
+ perfmon_getMetric at Base 4.1.0
+ perfmon_getMetricName at Base 4.1.0
+ perfmon_getMetricOfRegionThread at Base 4.1.0
+ perfmon_getMetricsOfRegion at Base 4.1.0
+ perfmon_getNumberOfEvents at Base 4.1.0
+ perfmon_getNumberOfGroups at Base 4.1.0
+ perfmon_getNumberOfMetrics at Base 4.1.0
+ perfmon_getNumberOfRegions at Base 4.1.0
+ perfmon_getNumberOfThreads at Base 4.1.0
+ perfmon_getResult at Base 4.1.0
+ perfmon_getResultOfRegionThread at Base 4.1.0
+ perfmon_getTagOfRegion at Base 4.1.0
+ perfmon_getThreadsOfRegion at Base 4.1.0
+ perfmon_getTimeOfGroup at Base 4.1.0
+ perfmon_getTimeOfRegion at Base 4.1.0
+ perfmon_init at Base 4.1.0
+ perfmon_init_maps at Base 4.1.0
+ perfmon_readCounters at Base 4.1.0
+ perfmon_readCountersCpu at Base 4.1.0
+ perfmon_readGroupCounters at Base 4.1.0
+ perfmon_readGroupThreadCounters at Base 4.1.0
+ perfmon_readMarkerFile at Base 4.1.0
+ perfmon_returnGroups at Base 4.1.0
+ perfmon_setVerbosity at Base 4.1.0
+ perfmon_setupCounters at Base 4.1.0
+ perfmon_startCounters at Base 4.1.0
+ perfmon_stopCounters at Base 4.1.0
+ perfmon_switchActiveGroup at Base 4.1.0
+ power_finalize at Base 4.1.0
+ power_getEnergyUnit at Base 4.1.0
+ power_init at Base 4.1.0
+ power_limitGet at Base 4.1.0
+ power_limitSet at Base 4.1.0
+ power_limitState at Base 4.1.0
+ power_names at Base 4.1.0
+ power_printEnergy at Base 4.1.0
+ power_read at Base 4.1.0
+ power_start at Base 4.1.0
+ power_stop at Base 4.1.0
+ power_tread at Base 4.1.0
+ print_supportedCPUs at Base 4.1.0
+ sockstr_to_socklist at Base 4.1.0
+ thermal_init at Base 4.1.0
+ thermal_read at Base 4.1.0
+ thermal_tread at Base 4.1.0
+ timer_finalize at Base 4.1.0
+ timer_getBaseline at Base 4.1.0
+ timer_getCpuClock at Base 4.1.0
+ timer_getCpuClockCurrent at Base 4.1.0
+ timer_getCycleClock at Base 4.1.0
+ timer_init at Base 4.1.0
+ timer_print at Base 4.1.0
+ timer_printCycles at Base 4.1.0
+ timer_reset at Base 4.1.0
+ timer_sleep at Base 4.1.0
+ timer_start at Base 4.1.0
+ timer_stop at Base 4.1.0
+ topology_finalize at Base 4.1.0
+ topology_init at Base 4.1.0
+liblikwidpin.so.4.1 likwid #MINVER#
+ pthread_create at Base 4.1.0
diff --git a/debian/patches/02-man-pages-fix.patch b/debian/patches/02-man-pages-fix.patch
index 7aeac8c..650f20c 100644
--- a/debian/patches/02-man-pages-fix.patch
+++ b/debian/patches/02-man-pages-fix.patch
@@ -3,22 +3,11 @@ Author: Thomas Roehl <thomas.roehl at fau.de>$
Last-Update: 2014-10-29$
---$
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
---- likwid-3.1.3.orig/doc/likwid-bench.1
-+++ likwid-3.1.3/doc/likwid-bench.1
+--- a/doc/likwid-bench.1
++++ b/doc/likwid-bench.1
@@ -1,5 +1,4 @@
.TH LIKWID-BENCH 1 <DATE> likwid\-<VERSION>
-.WARN
.SH NAME
likwid-bench \- low-level benchmark suite and microbenchmarking framework
.SH SYNOPSIS
---- likwid-3.1.3.orig/doc/likwid-perfscope.1
-+++ likwid-3.1.3/doc/likwid-perfscope.1
-@@ -1,7 +1,7 @@
- .TH LIKWID-PERFSCOPE 1 <DATE> likwid\-<VERSION>
- .SH NAME
- likwid-perfscope \- Frontend for the timeline mode of
--.N likwid-perfctr(1)
-+.B likwid-perfctr(1)
- that on-the-fly generates pictures from the measurements
- .SH SYNOPSIS
- .B likwid-perfscope
diff --git a/debian/patches/08-no-stream.patch b/debian/patches/08-no-stream.patch
index 860dc24..4f1b909 100644
--- a/debian/patches/08-no-stream.patch
+++ b/debian/patches/08-no-stream.patch
@@ -6,33 +6,14 @@ Description: No STREAM benchmark because of license problems
---$
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
-diff -Nur likwid-3.1.3.orig/test/Makefile likwid-3.1.3/test/Makefile
---- likwid-3.1.3.orig/test/Makefile 2015-05-05 16:29:22.011134000 +0200
-+++ likwid-3.1.3/test/Makefile 2015-05-05 16:32:21.055211000 +0200
-@@ -1,17 +1,11 @@
- LIKWID_LIB = -L../ -llikwid
- INCLUDES = -I../src/includes -I../ -I../MIC
-
--all: testmarker testmarkerF90 stream streamM
-+all: testmarker testmarkerF90
-
- testmarkerF90: chaos.F90
- ifort $(INCLUDES) -O3 -o $@ chaos.F90 $(LIKWID_LIB) -lpthread
-
--stream: stream.c
-- icc -O3 $(INCLUDES) -mmic -openmp -o $@ -DLIKWID_PERFMON stream.c $(LIKWID_LIB) -lm
--
--streamM: stream.c
-- gcc -O3 $(INCLUDES) -fopenmp -o $@ -DLIKWID_PERFMON stream.c $(LIKWID_LIB) -lm
--
- testmarker:
- gcc -O3 -std=c99 $(INCLUDES) -fopenmp -DLIKWID_PERFMON -o $@ testmarker-cnt.c $(LIKWID_LIB) -lm
-
-@@ -24,6 +18,6 @@
- .PHONY: clean
-
- clean:
-- rm -f stream streamM testmarker testmarkerF90
-+ rm -f testmarker testmarkerF90
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -4,7 +4,7 @@ LIKWID_LIB ?= -L$(PREFIX)/lib -llikwid
+ LIKWID_INCLUDE ?= -I$(PREFIX)/include
+ LIKWID_DEFINES ?= -DLIKWID_PERFMON
+-all: streamGCC
++all: testmarkerF90
+ GCC_C11_SUPPORT_MAJOR=$(shell /bin/bash -c "g++ -v 2>&1 | grep -o -E '([0-9])\.' | head -n 1 | tr -d '[:punct:]'")
+ GCC_C11_SUPPORT_MINOR=$(shell /bin/bash -c "g++ -v 2>&1 | grep -o -E '\.([0-9])\.' | head -n 1 | tr -d '[:punct:]'")
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 1f50bd4..1347e21 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -13,32 +13,39 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
AS = as
AR = ar
PAS = ./perl/AsmGen.pl
-@@ -12,16 +12,16 @@ GEN_PMHEADER = ./perl/gen_events.pl
+@@ -12,16 +12,16 @@ ANSI_CFLAGS =
#ANSI_CFLAGS += -Wextra
#ANSI_CFLAGS += -Wall
--CFLAGS = -O2 -Wno-format -Wno-nonnull -std=c99
+-CFLAGS = -O2 -std=c99 -Wno-format -fPIC
-FCFLAGS = -module ./ # ifort
-#FCFLAGS = -J ./ -fsyntax-only #gfortran
-+CFLAGS += -O2 -Wno-format -Wno-nonnull -std=c99
++CFLAGS += -O2 -std=c99 -Wno-format -fPIC
+#FCFLAGS = -module ./ # ifort
+FCFLAGS = $(FFLAGS) -J ./ -fsyntax-only #gfortran
PASFLAGS = x86-64
- ASFLAGS =
+ ASFLAGS =
-CPPFLAGS =
-LFLAGS = -pthread
+CPPFLAGS +=
+LFLAGS = $(LDFLAGS) -pthread
- SHARED_CFLAGS = -fpic
--SHARED_LFLAGS = -shared
-+SHARED_LFLAGS = $(LDFLAGS) -shared
+ SHARED_CFLAGS = -fPIC -fvisibility=hidden
+-SHARED_LFLAGS = -shared -fvisibility=hidden
++SHARED_LFLAGS = $(LDFLAGS) -shared -fvisibility=hidden
- DEFINES = -D_GNU_SOURCE
- DEFINES += -DPAGE_ALIGNMENT=4096
+ DEFINES = -DPAGE_ALIGNMENT=4096
+ DEFINES += -DLIKWID_MONITOR_LOCK
--- a/Makefile
+++ b/Makefile
-@@ -72,7 +72,7 @@ DEFINES += -DVERSION=$(VERSION)
+@@ -46,12 +46,12 @@ include $(MAKE_DIR)/include_$(COMPILER).
+ include $(MAKE_DIR)/config_checks.mk
+ include $(MAKE_DIR)/config_defines.mk
+
+-INCLUDES += -I./src/includes -I$(LUA_FOLDER)/includes -I$(HWLOC_FOLDER)/include -I$(BUILD_DIR)
+-LIBS += -ldl
++INCLUDES += -I./src/includes -I/usr/include/lua5.2 -I$(HWLOC_FOLDER)/include -I$(BUILD_DIR)
++LIBS += -ldl -llua5.2
#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
@@ -46,18 +53,50 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+#Q ?= @
GENGROUPLOCK = .gengroup
- ifeq ($(COMPILER),MIC)
-@@ -209,18 +209,18 @@ $(DYNAMIC_TARGET_LIB): $(OBJ)
+ VPATH = $(SRC_DIR)
+@@ -87,7 +87,7 @@ ifeq ($(BUILDFREQ),true)
+ L_APPS += likwid-setFrequencies
+ endif
+
+-CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
++CPPFLAGS := $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
+
+ all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF) $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(FREQ_TARGET) $(BENCH_TARGET)
+
+@@ -108,7 +108,7 @@ docs:
+ $(L_APPS): $(addprefix $(SRC_DIR)/applications/,$(addsuffix .lua,$(L_APPS)))
+ @echo "===> ADJUSTING $@"
+ @if [ "$(ACCESSMODE)" = "direct" ]; then sed -i -e s/"access_mode = 1"/"access_mode = 0"/g $(SRC_DIR)/applications/$@.lua;fi
+- @sed -e s/'<INSTALLED_BINPREFIX>'/$(subst /,\\/,$(INSTALLED_BINPREFIX))/g \
++ @sed -e s/'<INSTALLED_BINPREFIX>'\\/likwid-lua/$(subst /,\\/,$(INSTALLED_BINPREFIX))\\/lua5.2/g \
+ -e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
+ -e s/'<VERSION>'/$(VERSION).$(RELEASE)/g \
+ -e s/'<DATE>'/$(DATE)/g \
+@@ -126,29 +126,29 @@ $(L_HELPER):
+ -e s/'<RELEASE>'/$(RELEASE)/g \
+ $(SRC_DIR)/applications/$@ > $@
+
+-$(STATIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
++$(STATIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB)
+ @echo "===> CREATE STATIC LIB $(TARGET_LIB)"
+ $(Q)${AR} -crus $(STATIC_TARGET_LIB) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
+
+
+-$(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
++$(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB)
+ @echo "===> CREATE SHARED LIB $(TARGET_LIB)"
+- $(Q)${CC} $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) $(RPATHS)
++ $(Q)${CC} $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(RPATHS)
$(DAEMON_TARGET): $(SRC_DIR)/access-daemon/accessDaemon.c
- @echo "===> Build access daemon $(DAEMON_TARGET)"
-- $(Q)$(MAKE) -s -C $(SRC_DIR)/access-daemon $(DAEMON_TARGET)
-+ $(Q)$(MAKE) -C $(SRC_DIR)/access-daemon CFLAGS="$(CFLAGS) $(LDFLAGS)" $(DAEMON_TARGET)
+ @echo "===> BUILD access daemon likwid-accessD"
+- $(Q)$(MAKE) -s -C $(SRC_DIR)/access-daemon likwid-accessD
++ $(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-accessD
- $(SETFREQ_TARGET): $(SRC_DIR)/access-daemon/setFreq.c
- @echo "===> Build frequency daemon $(SETFREQ_TARGET)"
-- $(Q)$(MAKE) -s -C $(SRC_DIR)/access-daemon $(SETFREQ_TARGET)
-+ $(Q)$(MAKE) -C $(SRC_DIR)/access-daemon CFLAGS="$(CFLAGS) $(LDFLAGS)" $(SETFREQ_TARGET)
+ $(FREQ_TARGET): $(SRC_DIR)/access-daemon/setFreq.c
+ @echo "===> BUILD frequency daemon likwid-setFreq"
+- $(Q)$(MAKE) -s -C $(SRC_DIR)/access-daemon likwid-setFreq
++ $(Q)$(MAKE) -C $(SRC_DIR)/access-daemon likwid-setFreq
$(BUILD_DIR):
@mkdir $(BUILD_DIR)
@@ -69,53 +108,118 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
$(GENGROUPLOCK): $(foreach directory,$(shell ls $(GROUP_DIR)), $(wildcard $(GROUP_DIR)/$(directory)/*.txt))
@echo "===> GENERATE GROUP HEADERS"
-@@ -293,7 +293,7 @@ install:
- done
- @cp -f perl/feedGnuplot $(PREFIX)/bin
- @for app in $(PERL_APPS); do \
-- sed -e "s+<PREFIX>+$(PREFIX)+g" perl/$$app > $(PREFIX)/bin/$$app; \
-+ sed -e "s+<PREFIX>+/usr+g" perl/$$app > $(PREFIX)/bin/$$app; \
+@@ -166,7 +166,7 @@ $(TARGET_LUA_LIB):
+
+ $(TARGET_HWLOC_LIB):
+ @echo "===> ENTER $(HWLOC_FOLDER)"
+- $(Q)$(MAKE) -s --no-print-directory -C $(HWLOC_FOLDER) $(MAKECMDGOALS)
++ $(Q)$(MAKE) -s --no-print-directory -C $(HWLOC_FOLDER) LFLAGS="$(LDFLAGS)" $(MAKECMDGOALS)
+
+ $(BENCH_TARGET):
+ @echo "===> ENTER $(BENCH_FOLDER)"
+@@ -207,7 +207,7 @@ endif
+ .NOTPARALLEL:
+
+
+-clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
++clean: $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
+ @echo "===> CLEAN"
+ @for APP in $(L_APPS); do \
+ rm -f $$APP; \
+@@ -219,7 +219,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
+ @rm -f $(FORTRAN_IF_NAME)
+ @rm -f $(FREQ_TARGET) $(DAEMON_TARGET)
+
+-distclean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
++distclean: $(TARGET_HWLOC_LIB) $(BENCH_TARGET)
+ @echo "===> DIST CLEAN"
+ @for APP in $(L_APPS); do \
+ rm -f $$APP; \
+@@ -319,7 +319,7 @@ install: install_daemon install_freq
+ @for APP in $(C_APPS); do \
+ install -m 755 $$APP $(BINPREFIX); \
done
- @chmod 755 $(PREFIX)/bin/likwid-*
- @echo "===> INSTALL daemon applications to $(PREFIX)/sbin"
-@@ -329,11 +329,15 @@ install:
- @cp -f src/includes/likwid*.h $(PREFIX)/include/
- @cp -f src/includes/* $(PREFIX)/include/likwid
- @cp -f GCC/perfmon_group_types.h $(PREFIX)/include/likwid
-+ echo $(FORTRAN_INSTALL)
- $(FORTRAN_INSTALL)
-- @echo "===> INSTALL libraries to $(PREFIX)/lib"
-- @mkdir -p $(PREFIX)/lib
-- @cp -f $(LIKWID_LIB)* $(PREFIX)/lib
-- @chmod 755 $(PREFIX)/lib/$(PINLIB)
-+ @echo "===> INSTALL libraries to $(LIBPREFIX)"
-+ @mkdir -p $(LIBPREFIX)
-+ @cp -f $(LIKWID_LIB)* $(LIBPREFIX)
-+ @chmod 755 $(LIBPREFIX)/$(PINLIB)
-+ mv $(LIBPREFIX)/$(PINLIB) $(LIBPREFIX)/$(PINLIB).$(VERSION).$(RELEASE)
-+ ln -s $(PINLIB).$(VERSION).$(RELEASE) $(LIBPREFIX)/$(PINLIB).$(VERSION)
-+ ln -s $(PINLIB).$(VERSION).$(RELEASE) $(LIBPREFIX)/$(PINLIB)
- @echo "===> INSTALL filters to $(LIKWIDFILTERPATH)"
- @mkdir -p $(LIKWIDFILTERPATH)
- @cp -f filters/* $(LIKWIDFILTERPATH)
-@@ -353,8 +357,8 @@ uninstall:
- @echo "===> REMOVING headers from $(PREFIX)/include"
- @rm -f $(PREFIX)/include/likwid*.h
- @rm -rf $(PREFIX)/include/likwid
-- @echo "===> REMOVING libs from $(PREFIX)/lib"
-- @rm -f $(PREFIX)/lib/$(LIKWID_LIB)*
-+ @echo "===> REMOVING libs from $(LIBPREFIX)"
-+ @rm -f $(LIBPREFIX)/$(LIKWID_LIB)*
- @echo "===> REMOVING filter from $(PREFIX)/share"
- @rm -rf $(PREFIX)/share/likwid
-
---- a/config.mk
-+++ b/config.mk
-@@ -11,6 +11,7 @@ COLOR = BLUE#NO SPACE
- # Path were to install likwid
- PREFIX = /usr/local#NO SPACE
- MANPREFIX = $(PREFIX)/man#NO SPACE
-+LIBPREFIX = $(PREFIX)/lib#NO SPACE
-
- # For the daemon based secure msr/pci access configure
- # the absolute path to the msr daemon executable.
+- @install -m 755 ext/lua/lua $(BINPREFIX)/likwid-lua
++# @install -m 755 ext/lua/lua $(BINPREFIX)/likwid-lua
+ @echo "===> INSTALL helper applications to $(BINPREFIX)"
+ @install -m 755 perl/feedGnuplot $(BINPREFIX)
+ @echo "===> INSTALL lua to likwid interface to $(PREFIX)/share/lua"
+@@ -332,20 +332,20 @@ install: install_daemon install_freq
+ @install -m 755 $(TARGET_LIB) $(LIBPREFIX)/$(TARGET_LIB).$(VERSION).$(RELEASE)
+ @install -m 755 liblikwidpin.so $(LIBPREFIX)/liblikwidpin.so.$(VERSION).$(RELEASE)
+ @install -m 755 $(TARGET_HWLOC_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE)
+- @install -m 755 $(TARGET_LUA_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE)
++# @install -m 755 $(TARGET_LUA_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE)
+ @cd $(LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB)
+ @cd $(LIBPREFIX) && ln -fs $(TARGET_LIB).$(VERSION).$(RELEASE) $(TARGET_LIB).$(VERSION)
+ @cd $(LIBPREFIX) && ln -fs $(PINLIB).$(VERSION).$(RELEASE) $(PINLIB)
+ @cd $(LIBPREFIX) && ln -fs $(PINLIB).$(VERSION).$(RELEASE) $(PINLIB).$(VERSION)
+ @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB))
+ @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION)
+- @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB))
+- @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB)).$(VERSION)
++# @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB))
++# @cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION).$(RELEASE) $(shell basename $(TARGET_LUA_LIB)).$(VERSION)
+ @echo "===> INSTALL man pages to $(MANPREFIX)/man1"
+ @mkdir -p $(MANPREFIX)/man1
+ @chmod 775 $(MANPREFIX)/man1
+ @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
+- @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s+<PREFIX>+$(PREFIX)+g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
++ @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s+<PREFIX>+$(INSTALLED_PREFIX)+g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
+ @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
+ @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
+ @sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
+@@ -387,7 +387,7 @@ install: install_daemon install_freq
+ @chmod 775 $(PREFIX)/share/likwid/examples
+ @install -m 644 examples/* $(PREFIX)/share/likwid/examples
+ @echo "===> INSTALL default likwid-agent.conf to $(PREFIX)/share/likwid/mongroups"
+- @sed -e "s+<PREFIX>+$(PREFIX)+g" monitoring/likwid-agent.conf > $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
++ @sed -e "s+<PREFIX>+$(INSTALLED_PREFIX)+g" monitoring/likwid-agent.conf > $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
+ @chmod 644 $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
+ @echo "===> INSTALL filters to $(abspath $(PREFIX)/share/likwid/filter)"
+ @mkdir -p $(abspath $(PREFIX)/share/likwid/filter)
+@@ -586,4 +586,3 @@ help:
+ @echo "The common configuration is INSTALLED_PREFIX = PREFIX, so changing PREFIX is enough."
+ @echo "If PREFIX and INSTALLED_PREFIX differ, you have to move anything after 'make install' to"
+ @echo "the INSTALLED_PREFIX. You can also use 'make move' which does the job for you."
+-
+--- a/bench/Makefile
++++ b/bench/Makefile
+@@ -62,7 +62,7 @@ BENCH_DIR = ./x86-64
+ endif
+ endif
+
+-SHARED_TARGET_LIB := -L.. -L../ext/hwloc/ -L../ext/lua -llikwid -llikwid-hwloc -llikwid-lua
++SHARED_TARGET_LIB := -L.. -L../ext/hwloc/ -llikwid -llikwid-hwloc -llua5.2
+ STATIC_TARGET_LIB := ../liblikwid.a ../ext/hwloc/liblikwid-hwloc.a ../ext/lua/liblikwid-lua.a
+ TARGET_LIB = $(SHARED_TARGET_LIB)
+
+--- a/src/access-daemon/Makefile
++++ b/src/access-daemon/Makefile
+@@ -31,7 +31,7 @@ include ../../make/include_$(COMPILER).
+
+ DAEMON_TARGET = likwid-accessD
+ SETFREQ_TARGET = likwid-setFreq
+-Q ?= @
++#Q ?= @
+
+ DEFINES += -D_GNU_SOURCE -DMAX_NUM_THREADS=$(MAX_NUM_THREADS) -DMAX_NUM_NODES=$(MAX_NUM_NODES)
+ INCLUDES = -I../includes
+@@ -39,14 +39,14 @@ CFLAGS += -std=c99 -fPIC -pie -fPIE -
+ ifeq ($(COMPILER),GCCX86)
+ CFLAGS += -m32
+ endif
+-CPPFLAGS := $(DEFINES) $(INCLUDES)
++CPPFLAGS := $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
+
+ all: $(DAEMON_TARGET) $(SETFREQ_TARGET)
+
+ $(DAEMON_TARGET): accessDaemon.c
+- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o ../../$(DAEMON_TARGET) accessDaemon.c
++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ../../$(DAEMON_TARGET) accessDaemon.c
+
+ $(SETFREQ_TARGET): setFreq.c
+- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o ../../$(SETFREQ_TARGET) setFreq.c
++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ../../$(SETFREQ_TARGET) setFreq.c
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 2887ed0..aaff614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
#01-manpages.patch
02-man-pages-fix.patch
#03-Makefile-man.patch
-04-Makefile-overload.patch
-05-ghashc-copyright.patch
-06-ghashh-copyright.patch
-07-bstrlib.patch
+#04-Makefile-overload.patch
+#05-ghashc-copyright.patch
+#06-ghashh-copyright.patch
+#07-bstrlib.patch
08-no-stream.patch
10-debianize.patch
diff --git a/debian/rules b/debian/rules
index 92c09f0..73d7ba5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,14 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/architecture.mk
+DCPPFLAGS=$(CPPFLAGS)
+export DCPPFLAGS
+
%:
dh $@
override_dh_auto_build:
- $(MAKE) PREFIX=/usr FORTRAN_INTERFACE=true
+ $(MAKE) PREFIX=/usr RPATHS= FORTRAN_INTERFACE=true
override_dh_auto_install:
- $(MAKE) PREFIX=$$(pwd)/debian/likwid/usr FORTRAN_INTERFACE=true MANPREFIX=$$(pwd)/debian/likwid/usr/share/man LIBPREFIX=$$(pwd)/debian/likwid/usr/lib/$(DEB_BUILD_GNU_TYPE) install
+ $(MAKE) PREFIX=$$(pwd)/debian/likwid/usr INSTALLED_PREFIX=/usr FORTRAN_INTERFACE=true MANPREFIX=$$(pwd)/debian/likwid/usr/share/man LIBPREFIX=$$(pwd)/debian/likwid/usr/lib/$(DEB_BUILD_GNU_TYPE) install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/likwid/likwid.git
More information about the Likwid-commit
mailing list