haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hi, I found out that the cdrtools-3.01~a25.patch used in the recipes for 3.01a25, 3.01a27 and 3.01a28 could be simplified by mergeing the diffs on cdrtools-3.01/RULES/x86_64-haiku-{cc,gcc}.rul into a smaller (and yet equivalent) diff on cdrtools-3.01/RULES/MKLINKS.

Browse Source 
In cdrtools-3.01~a25.patch :
x86_64-haiku-{cc,gcc].rul are identical to bepc-haiku-{cc,gcc}.rul
whereas in cdrtools-3.01~a28.patch :
x86_64-haiku-{cc,gcc].rul are symlinks to bepc-haiku-{cc,gcc}.rul
(which get created at build time thanks to the 2 lines added in MKLINKS).
Thanks & kind regards
This commit is contained in:
fbrosson
2015-04-18 13:58:07 +00:00
parent a9d479f138
commit 0b67f7396e
1 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app-cdr/cdrtools/patches/cdrtools-3.01~a28.patch Normal file
View File

@@ -0,0 +1,64 @@
diff -urp cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
--- cdrtools-3.01/DEFAULTS/Defaults.haiku 2013-11-04 20:58:20.000000000 +0000
+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
@@ -30,16 +30,16 @@ CWARNOPTS=
DEFINCDIRS= $(SRCROOT)/include
DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
+LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+RUNPATH= -R$(INS_BASE)/lib
###########################################################################
#
# Installation config stuff
#
###########################################################################
-INS_BASE= /boot/opt/schily
+INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY)
INS_KBASE= /
INS_RBASE= /
#
diff -ur cdrtools-3.01/libscg/scsi-beos.c cdrtools-3.01-haiku/libscg/scsi-beos.c
--- cdrtools-3.01/libscg/scsi-beos.c 2009-06-30 18:34:03.000000000 +0000
+++ cdrtools-3.01-haiku/libscg/scsi-beos.c
@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
char buf[128];
if (busno < 8)
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
+#else
js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
+#endif
else
#ifdef __HAIKU__
js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
return (f->fd);
}
if (busno < 8) {
+#ifdef __HAIKU__
+ js_snprintf(buf, sizeof (buf),
+ "/dev/disk/scsi/%d/%d/%d/raw",
+ busno, tgt, tlun);
+#else
js_snprintf(buf, sizeof (buf),
"/dev/bus/scsi/%d/%d/%d/raw",
busno, tgt, tlun);
+#endif
} else {
char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
js_snprintf(buf, sizeof (buf),
diff -ur cdrtools-3.01/RULES/MKLINKS cdrtools-3.01-haiku/RULES/MKLINKS
--- cdrtools-3.01/RULES/MKLINKS 2014-06-05 22:12:13.000000000 +0000
+++ cdrtools-3.01-haiku/RULES/MKLINKS
@@ -392,4 +392,6 @@
$symlink bepc-beos-gcc.rul bemac-beos-gcc.rul
$symlink bepc-haiku-cc.rul bemac-haiku-cc.rul
$symlink bepc-haiku-gcc.rul bemac-haiku-gcc.rul
+$symlink bepc-haiku-cc.rul x86_64-haiku-cc.rul
+$symlink bepc-haiku-gcc.rul x86_64-haiku-gcc.rul
$symlink alpha-openvms-cc.rul alphaserver_ds20_500_mhz-openvms-cc.rul