use DIST_LIBDIR to allow override of LIBDIR ; gcc4.4 patches from debian (once again...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5429 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index fcd575dcef5d62f497522f1c32983bcaa5d4355e..24fc84f0964aeee446eaf72e1ef54baace5a9c09 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -51,7 +51,7 @@ opts.AddOptions(
     PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
     BoolOption('SURFACES', 'Build support for control surfaces', 1),
     BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
-    ('LIBDIR', 'Set librarydir (typically lib or lib64)', 'lib'),
+    ('DIST_LIBDIR', 'Explicitly set library dir. If not set, Fedora-style defaults are used (typically lib or lib64)', ''),
     BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
     BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
@@ -742,10 +742,13 @@ if env['FPU_OPTIMIZATION']:
 
 # handle x86/x86_64 libdir properly
 
-if env['DIST_TARGET'] == 'x86_64':
-    env['LIBDIR']='lib64'
+if env['DIST_LIBDIR'] == '':
+    if env['DIST_TARGET'] == 'x86_64':
+        env['LIBDIR']='lib64'
+    else:
+        env['LIBDIR']='lib'
 else:
-    env['LIBDIR']='lib'
+    env['LIBDIR'] = env['DIST_LIBDIR']
 
 #
 # no VST on x86_64

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 2fed8e14f6d8ac54cece075ad110e76b97bdad38..1bcd75e5e60483b02ff8ba629d958861a09fd7a6 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -3530,7 +3530,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
                int32_t children = 0, numtracks = 0;
                // XXX hard coding track limit, oh my, so very very bad
-               bitset <1024> tracks (0x00);
+               bitset <1024> tracks (0x00ul);
                /* get a bitmask representing the visible tracks */
 
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {

diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc
index cd30f50a2b9a142a90dcef130f7ec7e7857d5c24..218ac6bf563d12de6d5ff775aa4dee77dfd40b6d 100644 (file)
--- a/libs/pbd/convert.cc
+++ b/libs/pbd/convert.cc
@@ -19,6 +19,7 @@
 
 #include <cstdio>
 #include <cmath>
+#include <cstdio>
 #include <locale>
 #include <algorithm>
 #include <stdint.h>

diff --git a/libs/pbd/shortpath.cc b/libs/pbd/shortpath.cc
index 7a075a5b4e0da1d8261dd59571143868041c1ca0..f5a6f696a723781477e191784ddc802c50b64ea9 100644 (file)
--- a/libs/pbd/shortpath.cc
+++ b/libs/pbd/shortpath.cc
@@ -20,6 +20,8 @@
 #include <stdint.h>
 #include <pbd/shortpath.h>
 
+#include <stdint.h>
+
 using namespace Glib;
 using namespace std;
 

diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index 304859c2d3bca42d5cf867c8c40f515fea49899f..ee02d451ac39d375b3a7acce81c01bf608d0b63a 100644 (file)
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -19,6 +19,7 @@
 
 #include <cstdio>
 #include <pbd/stacktrace.h>
+#include <cstdio>
 #include <iostream>
 
 /* Obtain a backtrace and print it to stdout. */

diff --git a/libs/surfaces/tranzport/lcd.cc b/libs/surfaces/tranzport/lcd.cc
index 88f9ea36d6ecbed82355424a5dd0988de6d2314d..29c20aee2e45b4f6f81193eb19f73d981802c5be 100644 (file)
--- a/libs/surfaces/tranzport/lcd.cc
+++ b/libs/surfaces/tranzport/lcd.cc
@@ -30,7 +30,7 @@ bool TranzportControlProtocol::lcd_damage()
 
 bool TranzportControlProtocol::lcd_damage (int row, int col, int length)
 {
-       std::bitset<ROWS*COLUMNS> mask1(0);
+       std::bitset<ROWS*COLUMNS> mask1(0ul);
        // there's an intrinsic to do this fast, darn it, or I'm just sleepy
        for (int i = 0; i < length; i++) { mask1[i] = 1; }
        std::bitset<ROWS*COLUMNS> mask(mask1 << (row*COLUMNS+col));
@@ -55,7 +55,7 @@ bool TranzportControlProtocol::lcd_isdamaged ()
 bool TranzportControlProtocol::lcd_isdamaged (int row, int col, int length)
 {
        // there's an intrinsic to do this fast, darn it
-       std::bitset<ROWS*COLUMNS> mask1(0);
+       std::bitset<ROWS*COLUMNS> mask1(0ul);
        for (int i = 0; i < length; i++) { mask1[i] = 1; }
        std::bitset<ROWS*COLUMNS> mask(mask1 << (row*COLUMNS+col));
        mask &= screen_invalid;

diff --git a/libs/surfaces/tranzport/screen.cc b/libs/surfaces/tranzport/screen.cc
index 0ca9419bd6c7dac9b5f1f736aaf2abbf7b538270..b32d2faf134c021c98d3eeee90919e1e50410f09 100644 (file)
--- a/libs/surfaces/tranzport/screen.cc
+++ b/libs/surfaces/tranzport/screen.cc
@@ -21,6 +21,8 @@
 #include <cstring>
 #include <tranzport_control_protocol.h>
 
+#include <cstring>
+
 void
 TranzportControlProtocol::screen_clear ()
 {