diff options
author | Alexander Leidinger <netchild@FreeBSD.org> | 2002-11-13 18:56:34 +0000 |
---|---|---|
committer | Alexander Leidinger <netchild@FreeBSD.org> | 2002-11-13 18:56:34 +0000 |
commit | 94afc39b859ac8fe33cb3808f9f000bcc5dc394d (patch) | |
tree | 76ba50d2c963fad79cd7bbd5e316677070c95606 /sysutils/cdrdao | |
parent | Add gob2. (diff) |
Add missing patches, see log of Makefile for more.
Pointy hat to: netchild
Notes
Notes:
svn path=/head/; revision=70049
Diffstat (limited to 'sysutils/cdrdao')
4 files changed, 100 insertions, 0 deletions
diff --git a/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc b/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc new file mode 100644 index 000000000000..99922ca57a51 --- /dev/null +++ b/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc @@ -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; diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul new file mode 100644 index 000000000000..22d48301343d --- /dev/null +++ b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul @@ -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= diff --git a/sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs b/sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs new file mode 100644 index 000000000000..db8f407f14b1 --- /dev/null +++ b/sysutils/cdrdao/files/patch-scsilib::TARGETS::Targetdirs @@ -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 + ########################################################################### diff --git a/sysutils/cdrdao/files/patch-scsilib::include::btorder.h b/sysutils/cdrdao/files/patch-scsilib::include::btorder.h new file mode 100644 index 000000000000..6a364364c719 --- /dev/null +++ b/sysutils/cdrdao/files/patch-scsilib::include::btorder.h @@ -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) + /* |