haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

milkytracker: enable x86 and x86_64

Browse Source 
* link against libstdc++
This commit is contained in:
Jerome Duval
2014-09-03 19:50:32 +00:00
parent 2239ef501b
commit e6ab380a7e
3 changed files with 174 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media-sound/milkytracker/milkytracker-0.90.86.recipe
View File

@@ -21,8 +21,14 @@ LICENSE="GNU GPL v3
New-BSD"
SRC_URI="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2"
CHECKSUM_SHA256="eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed"
REVISION="1"
ARCHITECTURES="x86_gcc2 ?x86"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="milkytracker-$portVersion.patchset"
if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then
PATCHES="milkytracker-$portVersion-gcc4.patchset"
fi
PROVIDES="
milkytracker = $portVersion
@@ -31,11 +37,11 @@ PROVIDES="
"
REQUIRES="
haiku${secondaryArchSuffix} >= $haikuVersion
zlib >= 1.2.3
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix >= 1.2.3
"
BUILD_REQUIRES="
zlib_devel >= 1.2.3
devel:libz$secondaryArchSuffix >= 1.2.3
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
@@ -49,7 +55,7 @@ BUILD()
cd $sourceDir/platforms/haiku
bash ./Add_Jamfiles.sh
cd ../..
jam
jam -q
}
INSTALL()

81
media-sound/milkytracker/patches/milkytracker-0.90.86-gcc4.patchset Normal file
View File

@@ -0,0 +1,81 @@
From d88d3a620b424afad1a1cb92b2d9fc421c947e53 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:22:32 +0000
Subject: include <strings.h>
diff --git a/src/compression/zziplib/generic/file.cpp b/src/compression/zziplib/generic/file.cpp
index 4c691ec..b64ca65 100644
--- a/src/compression/zziplib/generic/file.cpp
+++ b/src/compression/zziplib/generic/file.cpp
@@ -15,6 +15,7 @@
#include <zzip_file.h>
#include <string.h>
+#include <strings.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/compression/zziplib/generic/stat.cpp b/src/compression/zziplib/generic/stat.cpp
index 0759a82..133c858 100644
--- a/src/compression/zziplib/generic/stat.cpp
+++ b/src/compression/zziplib/generic/stat.cpp
@@ -20,6 +20,7 @@
#include <zzip_lib.h> /* exported...*/
#include <zzip_file.h>
#include <string.h>
+#include <strings.h>
#include <sys/stat.h>
#define ZZIP_USE_INTERNAL
diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h
index 23ab385..831c284 100644
--- a/src/ppui/BasicTypes.h
+++ b/src/ppui/BasicTypes.h
@@ -43,7 +43,7 @@ typedef signed int pp_int32;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
- #include <string.h>
+ #include <strings.h>
#include "VirtualKeys.h"
#include "PPSystemString_POSIX.h"
#endif
--
1.8.3.4
From f282da166a53186366e41fdc66804fd792fa8ee6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 39e0412..16b1ef0 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++ ;
LinkLibraries MilkyTracker :
libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 662ee18..74f80dc 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++ ;
Main MilkySettings :
MilkySettingsApplication.cpp
--
1.8.3.4

81
media-sound/milkytracker/patches/milkytracker-0.90.86.patchset Normal file
View File

@@ -0,0 +1,81 @@
From d88d3a620b424afad1a1cb92b2d9fc421c947e53 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:22:32 +0000
Subject: include <strings.h>
diff --git a/src/compression/zziplib/generic/file.cpp b/src/compression/zziplib/generic/file.cpp
index 4c691ec..b64ca65 100644
--- a/src/compression/zziplib/generic/file.cpp
+++ b/src/compression/zziplib/generic/file.cpp
@@ -15,6 +15,7 @@
#include <zzip_file.h>
#include <string.h>
+#include <strings.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/compression/zziplib/generic/stat.cpp b/src/compression/zziplib/generic/stat.cpp
index 0759a82..133c858 100644
--- a/src/compression/zziplib/generic/stat.cpp
+++ b/src/compression/zziplib/generic/stat.cpp
@@ -20,6 +20,7 @@
#include <zzip_lib.h> /* exported...*/
#include <zzip_file.h>
#include <string.h>
+#include <strings.h>
#include <sys/stat.h>
#define ZZIP_USE_INTERNAL
diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h
index 23ab385..831c284 100644
--- a/src/ppui/BasicTypes.h
+++ b/src/ppui/BasicTypes.h
@@ -43,7 +43,7 @@ typedef signed int pp_int32;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
- #include <string.h>
+ #include <strings.h>
#include "VirtualKeys.h"
#include "PPSystemString_POSIX.h"
#endif
--
1.8.3.4
From f282da166a53186366e41fdc66804fd792fa8ee6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 39e0412..16b1ef0 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++.r4 ;
LinkLibraries MilkyTracker :
libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 662ee18..74f80dc 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++.r4 ;
Main MilkySettings :
MilkySettingsApplication.cpp
--
1.8.3.4