mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Add missing patches, see log of Makefile for more.
Pointy hat to: netchild
This commit is contained in:
parent
79f1308d7e
commit
94afc39b85
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70049
8 changed files with 200 additions and 0 deletions
20
audio/cdrdao/files/patch-dao::ScsiIf-lib.cc
Normal file
20
audio/cdrdao/files/patch-dao::ScsiIf-lib.cc
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- dao/ScsiIf-lib.cc.orig Tue Oct 29 19:40:39 2002
|
||||||
|
+++ dao/ScsiIf-lib.cc Tue Oct 29 20:14:24 2002
|
||||||
|
@@ -204,7 +204,7 @@
|
||||||
|
scmd->cdb_len = cmdLen;
|
||||||
|
|
||||||
|
if (dataOutLen > 0) {
|
||||||
|
- if (((unsigned)dataOut % impl_->pageSize_) != 0) {
|
||||||
|
+ if (((size_t)dataOut % impl_->pageSize_) != 0) {
|
||||||
|
//message(0, "Use SCSI buffer for data out.");
|
||||||
|
memcpy(impl_->pageAlignedBuffer_, dataOut, dataOutLen);
|
||||||
|
scmd->addr = impl_->pageAlignedBuffer_;
|
||||||
|
@@ -217,7 +217,7 @@
|
||||||
|
scmd->size = dataOutLen;
|
||||||
|
}
|
||||||
|
else if (dataInLen > 0) {
|
||||||
|
- if (((unsigned)dataIn % impl_->pageSize_) != 0) {
|
||||||
|
+ if (((size_t)dataIn % impl_->pageSize_) != 0) {
|
||||||
|
//message(0, "Use SCSI buffer for data in.");
|
||||||
|
scmd->addr = impl_->pageAlignedBuffer_;
|
||||||
|
usedPageAlignedBuffer = 1;
|
31
audio/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
Normal file
31
audio/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
--- scsilib/RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002
|
||||||
|
+++ scsilib/RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002
|
||||||
|
@@ -24,7 +24,8 @@
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
|
||||||
|
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
|
||||||
|
+XCFLAGS:= $(CFLAGS)
|
||||||
|
+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
|
||||||
|
|
||||||
|
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
|
||||||
|
COPTS=
|
||||||
|
@@ -57,14 +58,13 @@
|
||||||
|
|
||||||
|
FLOAT_OPTIONS=
|
||||||
|
|
||||||
|
-CC= @echo " ==> COMPILING \"$@\""; gcc
|
||||||
|
-LDCC= @echo " ==> LINKING \"$@\""; gcc
|
||||||
|
-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
|
||||||
|
-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
|
||||||
|
+LDCC= $(CC)
|
||||||
|
+DYNLD= $(CC)
|
||||||
|
+RANLIB= ranlib
|
||||||
|
ARFLAGS= cr
|
||||||
|
LORDER= lorder
|
||||||
|
TSORT= tsort
|
||||||
|
|
||||||
|
RMDEP= :
|
||||||
|
-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
|
||||||
|
+MKDEP= $(CC) -M
|
||||||
|
MKDEP_OUT=
|
8
audio/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
Normal file
8
audio/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
--- scsilib/TARGETS/Targetdirs.orig Tue Oct 29 00:45:24 2002
|
||||||
|
+++ scsilib/TARGETS/Targetdirs Tue Oct 29 00:45:59 2002
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
#ident %W% %E% %Q%
|
||||||
|
###########################################################################
|
||||||
|
-DIRS= conf inc lib libscg libschily librscg libdeflt rscsi export
|
||||||
|
+DIRS= conf inc lib libscg libschily export
|
||||||
|
###########################################################################
|
41
audio/cdrdao/files/patch-scsilib::include::btorder.h
Normal file
41
audio/cdrdao/files/patch-scsilib::include::btorder.h
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
--- scsilib/include/btorder.h.orig Mon Oct 28 10:15:12 2002
|
||||||
|
+++ scsilib/include/btorder.h Mon Oct 28 10:15:29 2002
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-/* @(#)btorder.h 1.14 01/10/09 Copyright 1996 J. Schilling */
|
||||||
|
+/* @(#)btorder.h 1.15 01/12/09 Copyright 1996 J. Schilling */
|
||||||
|
/*
|
||||||
|
* Definitions for Bit and Byte ordering
|
||||||
|
*
|
||||||
|
@@ -66,27 +66,20 @@
|
||||||
|
/*
|
||||||
|
* Convert byte-order definitions from xconfig.h into our values
|
||||||
|
* and verify them.
|
||||||
|
+ * Note that we cannot use the definitions _LITTLE_ENDIAN and _BIG_ENDIAN
|
||||||
|
+ * because they are used on IRIX-6.5 with different meaning.
|
||||||
|
*/
|
||||||
|
#if defined(HAVE_C_BIGENDIAN) && \
|
||||||
|
!defined(WORDS_BIGENDIAN)
|
||||||
|
#define WORDS_LITTLEENDIAN
|
||||||
|
-#define _LITTLE_ENDIAN
|
||||||
|
+/*#define _LITTLE_ENDIAN*/
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_C_BIGENDIAN) && \
|
||||||
|
defined(WORDS_BIGENDIAN)
|
||||||
|
-#define _BIG_ENDIAN
|
||||||
|
+#undef WORDS_LITTLEENDIAN
|
||||||
|
+/*#define _BIG_ENDIAN*/
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
-#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
|
||||||
|
-/*
|
||||||
|
- * #error will not work for all compilers (e.g. sunos4)
|
||||||
|
- * The following line will abort compilation on all compilers
|
||||||
|
- * if none of the above is defines. And that's what we want.
|
||||||
|
- */
|
||||||
|
-error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
|
||||||
|
#if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
|
||||||
|
/*
|
20
sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
Normal file
20
sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- dao/ScsiIf-lib.cc.orig Tue Oct 29 19:40:39 2002
|
||||||
|
+++ dao/ScsiIf-lib.cc Tue Oct 29 20:14:24 2002
|
||||||
|
@@ -204,7 +204,7 @@
|
||||||
|
scmd->cdb_len = cmdLen;
|
||||||
|
|
||||||
|
if (dataOutLen > 0) {
|
||||||
|
- if (((unsigned)dataOut % impl_->pageSize_) != 0) {
|
||||||
|
+ if (((size_t)dataOut % impl_->pageSize_) != 0) {
|
||||||
|
//message(0, "Use SCSI buffer for data out.");
|
||||||
|
memcpy(impl_->pageAlignedBuffer_, dataOut, dataOutLen);
|
||||||
|
scmd->addr = impl_->pageAlignedBuffer_;
|
||||||
|
@@ -217,7 +217,7 @@
|
||||||
|
scmd->size = dataOutLen;
|
||||||
|
}
|
||||||
|
else if (dataInLen > 0) {
|
||||||
|
- if (((unsigned)dataIn % impl_->pageSize_) != 0) {
|
||||||
|
+ if (((size_t)dataIn % impl_->pageSize_) != 0) {
|
||||||
|
//message(0, "Use SCSI buffer for data in.");
|
||||||
|
scmd->addr = impl_->pageAlignedBuffer_;
|
||||||
|
usedPageAlignedBuffer = 1;
|
|
@ -0,0 +1,31 @@
|
||||||
|
--- scsilib/RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002
|
||||||
|
+++ scsilib/RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002
|
||||||
|
@@ -24,7 +24,8 @@
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
|
||||||
|
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
|
||||||
|
+XCFLAGS:= $(CFLAGS)
|
||||||
|
+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
|
||||||
|
|
||||||
|
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
|
||||||
|
COPTS=
|
||||||
|
@@ -57,14 +58,13 @@
|
||||||
|
|
||||||
|
FLOAT_OPTIONS=
|
||||||
|
|
||||||
|
-CC= @echo " ==> COMPILING \"$@\""; gcc
|
||||||
|
-LDCC= @echo " ==> LINKING \"$@\""; gcc
|
||||||
|
-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
|
||||||
|
-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
|
||||||
|
+LDCC= $(CC)
|
||||||
|
+DYNLD= $(CC)
|
||||||
|
+RANLIB= ranlib
|
||||||
|
ARFLAGS= cr
|
||||||
|
LORDER= lorder
|
||||||
|
TSORT= tsort
|
||||||
|
|
||||||
|
RMDEP= :
|
||||||
|
-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
|
||||||
|
+MKDEP= $(CC) -M
|
||||||
|
MKDEP_OUT=
|
8
sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
Normal file
8
sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
--- scsilib/TARGETS/Targetdirs.orig Tue Oct 29 00:45:24 2002
|
||||||
|
+++ scsilib/TARGETS/Targetdirs Tue Oct 29 00:45:59 2002
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
#ident %W% %E% %Q%
|
||||||
|
###########################################################################
|
||||||
|
-DIRS= conf inc lib libscg libschily librscg libdeflt rscsi export
|
||||||
|
+DIRS= conf inc lib libscg libschily export
|
||||||
|
###########################################################################
|
41
sysutils/cdrdao/files/patch-scsilib::include::btorder.h
Normal file
41
sysutils/cdrdao/files/patch-scsilib::include::btorder.h
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
--- scsilib/include/btorder.h.orig Mon Oct 28 10:15:12 2002
|
||||||
|
+++ scsilib/include/btorder.h Mon Oct 28 10:15:29 2002
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-/* @(#)btorder.h 1.14 01/10/09 Copyright 1996 J. Schilling */
|
||||||
|
+/* @(#)btorder.h 1.15 01/12/09 Copyright 1996 J. Schilling */
|
||||||
|
/*
|
||||||
|
* Definitions for Bit and Byte ordering
|
||||||
|
*
|
||||||
|
@@ -66,27 +66,20 @@
|
||||||
|
/*
|
||||||
|
* Convert byte-order definitions from xconfig.h into our values
|
||||||
|
* and verify them.
|
||||||
|
+ * Note that we cannot use the definitions _LITTLE_ENDIAN and _BIG_ENDIAN
|
||||||
|
+ * because they are used on IRIX-6.5 with different meaning.
|
||||||
|
*/
|
||||||
|
#if defined(HAVE_C_BIGENDIAN) && \
|
||||||
|
!defined(WORDS_BIGENDIAN)
|
||||||
|
#define WORDS_LITTLEENDIAN
|
||||||
|
-#define _LITTLE_ENDIAN
|
||||||
|
+/*#define _LITTLE_ENDIAN*/
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_C_BIGENDIAN) && \
|
||||||
|
defined(WORDS_BIGENDIAN)
|
||||||
|
-#define _BIG_ENDIAN
|
||||||
|
+#undef WORDS_LITTLEENDIAN
|
||||||
|
+/*#define _BIG_ENDIAN*/
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
-#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
|
||||||
|
-/*
|
||||||
|
- * #error will not work for all compilers (e.g. sunos4)
|
||||||
|
- * The following line will abort compilation on all compilers
|
||||||
|
- * if none of the above is defines. And that's what we want.
|
||||||
|
- */
|
||||||
|
-error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
|
||||||
|
#if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
|
||||||
|
/*
|
Loading…
Add table
Reference in a new issue