mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-26 09:46:09 +00:00
Fix patch which was apllied to the wrong dir.
This commit is contained in:
Martin Blapp
parent
d2a27b18f5
commit
71330591d0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=77559
@ -1,34 +1,27 @@
|
||||
Index: files/patch-scptools::source::linker::searchcache
|
||||
===================================================================
|
||||
RCS file: files/patch-scptools::source::linker::searchcache
|
||||
diff -N files/patch-scptools::source::linker::searchcache
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ files/patch-scptools::source::linker::searchcache 4 Aug 2002 15:28:04 -0000
|
||||
@@ -0,0 +1,27 @@
|
||||
+--- ../scptools/source/linker/searchcache.hxx.orig Fri Aug 2 22:53:46 2002
|
||||
++++ ../scptools/source/linker/searchcache.hxx Fri Aug 2 22:54:50 2002
|
||||
+@@ -72,11 +72,11 @@
|
||||
+ // types
|
||||
+ ///////////////////////////////////////////////////////////////////////////////
|
||||
+
|
||||
+-DECLARE_LIST( FileList, ByteString* )
|
||||
++DECLARE_LIST( SCacheFileList, ByteString* )
|
||||
+ struct Include
|
||||
+ {
|
||||
+ ByteString aBaseDir;
|
||||
+- FileList aFileLst;
|
||||
++ SCacheFileList aFileLst;
|
||||
+ };
|
||||
+ DECLARE_LIST( IncludeList, Include* )
|
||||
+
|
||||
+--- ../scptools/source/linker/searchcache.cxx.orig Fri Aug 2 22:53:35 2002
|
||||
++++ ../scptools/source/linker/searchcache.cxx Fri Aug 2 22:55:14 2002
|
||||
+@@ -218,7 +218,7 @@
|
||||
+ rPath += aDelim;
|
||||
+ }
|
||||
+
|
||||
+-void ScanFileList( const ByteString& rPath, FileList& rLst )
|
||||
++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst )
|
||||
+ {
|
||||
+ Dir aFiles( rPath, FSYS_KIND_FILE );
|
||||
+ for( USHORT i = 0; i < aFiles.Count(); ++i )
|
||||
--- ../scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003
|
||||
+++ ../scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003
|
||||
@@ -72,11 +72,11 @@
|
||||
// types
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
-DECLARE_LIST( FileList, ByteString* )
|
||||
+DECLARE_LIST( SCacheFileList, ByteString* )
|
||||
struct Include
|
||||
{
|
||||
ByteString aBaseDir;
|
||||
- FileList aFileLst;
|
||||
+ SCacheFileList aFileLst;
|
||||
};
|
||||
DECLARE_LIST( IncludeList, Include* )
|
||||
|
||||
--- ../scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003
|
||||
+++ ../scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003
|
||||
@@ -218,7 +218,7 @@
|
||||
rPath += aDelim;
|
||||
}
|
||||
|
||||
-void ScanFileList( const ByteString& rPath, FileList& rLst )
|
||||
+void ScanFileList( const ByteString& rPath, ScanFileList& rLst )
|
||||
{
|
||||
Dir aFiles( rPath, FSYS_KIND_FILE );
|
||||
for( USHORT i = 0; i < aFiles.Count(); ++i )
|
||||
|
||||
@ -1,34 +1,27 @@
|
||||
Index: files/patch-scptools::source::linker::searchcache
|
||||
===================================================================
|
||||
RCS file: files/patch-scptools::source::linker::searchcache
|
||||
diff -N files/patch-scptools::source::linker::searchcache
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ files/patch-scptools::source::linker::searchcache 4 Aug 2002 15:28:04 -0000
|
||||
@@ -0,0 +1,27 @@
|
||||
+--- ../scptools/source/linker/searchcache.hxx.orig Fri Aug 2 22:53:46 2002
|
||||
++++ ../scptools/source/linker/searchcache.hxx Fri Aug 2 22:54:50 2002
|
||||
+@@ -72,11 +72,11 @@
|
||||
+ // types
|
||||
+ ///////////////////////////////////////////////////////////////////////////////
|
||||
+
|
||||
+-DECLARE_LIST( FileList, ByteString* )
|
||||
++DECLARE_LIST( SCacheFileList, ByteString* )
|
||||
+ struct Include
|
||||
+ {
|
||||
+ ByteString aBaseDir;
|
||||
+- FileList aFileLst;
|
||||
++ SCacheFileList aFileLst;
|
||||
+ };
|
||||
+ DECLARE_LIST( IncludeList, Include* )
|
||||
+
|
||||
+--- ../scptools/source/linker/searchcache.cxx.orig Fri Aug 2 22:53:35 2002
|
||||
++++ ../scptools/source/linker/searchcache.cxx Fri Aug 2 22:55:14 2002
|
||||
+@@ -218,7 +218,7 @@
|
||||
+ rPath += aDelim;
|
||||
+ }
|
||||
+
|
||||
+-void ScanFileList( const ByteString& rPath, FileList& rLst )
|
||||
++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst )
|
||||
+ {
|
||||
+ Dir aFiles( rPath, FSYS_KIND_FILE );
|
||||
+ for( USHORT i = 0; i < aFiles.Count(); ++i )
|
||||
--- ../scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003
|
||||
+++ ../scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003
|
||||
@@ -72,11 +72,11 @@
|
||||
// types
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
-DECLARE_LIST( FileList, ByteString* )
|
||||
+DECLARE_LIST( SCacheFileList, ByteString* )
|
||||
struct Include
|
||||
{
|
||||
ByteString aBaseDir;
|
||||
- FileList aFileLst;
|
||||
+ SCacheFileList aFileLst;
|
||||
};
|
||||
DECLARE_LIST( IncludeList, Include* )
|
||||
|
||||
--- ../scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003
|
||||
+++ ../scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003
|
||||
@@ -218,7 +218,7 @@
|
||||
rPath += aDelim;
|
||||
}
|
||||
|
||||
-void ScanFileList( const ByteString& rPath, FileList& rLst )
|
||||
+void ScanFileList( const ByteString& rPath, ScanFileList& rLst )
|
||||
{
|
||||
Dir aFiles( rPath, FSYS_KIND_FILE );
|
||||
for( USHORT i = 0; i < aFiles.Count(); ++i )
|
||||
|
||||
@ -1,34 +1,27 @@
|
||||
Index: files/patch-scptools::source::linker::searchcache
|
||||
===================================================================
|
||||
RCS file: files/patch-scptools::source::linker::searchcache
|
||||
diff -N files/patch-scptools::source::linker::searchcache
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ files/patch-scptools::source::linker::searchcache 4 Aug 2002 15:28:04 -0000
|
||||
@@ -0,0 +1,27 @@
|
||||
+--- ../scptools/source/linker/searchcache.hxx.orig Fri Aug 2 22:53:46 2002
|
||||
++++ ../scptools/source/linker/searchcache.hxx Fri Aug 2 22:54:50 2002
|
||||
+@@ -72,11 +72,11 @@
|
||||
+ // types
|
||||
+ ///////////////////////////////////////////////////////////////////////////////
|
||||
+
|
||||
+-DECLARE_LIST( FileList, ByteString* )
|
||||
++DECLARE_LIST( SCacheFileList, ByteString* )
|
||||
+ struct Include
|
||||
+ {
|
||||
+ ByteString aBaseDir;
|
||||
+- FileList aFileLst;
|
||||
++ SCacheFileList aFileLst;
|
||||
+ };
|
||||
+ DECLARE_LIST( IncludeList, Include* )
|
||||
+
|
||||
+--- ../scptools/source/linker/searchcache.cxx.orig Fri Aug 2 22:53:35 2002
|
||||
++++ ../scptools/source/linker/searchcache.cxx Fri Aug 2 22:55:14 2002
|
||||
+@@ -218,7 +218,7 @@
|
||||
+ rPath += aDelim;
|
||||
+ }
|
||||
+
|
||||
+-void ScanFileList( const ByteString& rPath, FileList& rLst )
|
||||
++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst )
|
||||
+ {
|
||||
+ Dir aFiles( rPath, FSYS_KIND_FILE );
|
||||
+ for( USHORT i = 0; i < aFiles.Count(); ++i )
|
||||
--- ../scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003
|
||||
+++ ../scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003
|
||||
@@ -72,11 +72,11 @@
|
||||
// types
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
-DECLARE_LIST( FileList, ByteString* )
|
||||
+DECLARE_LIST( SCacheFileList, ByteString* )
|
||||
struct Include
|
||||
{
|
||||
ByteString aBaseDir;
|
||||
- FileList aFileLst;
|
||||
+ SCacheFileList aFileLst;
|
||||
};
|
||||
DECLARE_LIST( IncludeList, Include* )
|
||||
|
||||
--- ../scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003
|
||||
+++ ../scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003
|
||||
@@ -218,7 +218,7 @@
|
||||
rPath += aDelim;
|
||||
}
|
||||
|
||||
-void ScanFileList( const ByteString& rPath, FileList& rLst )
|
||||
+void ScanFileList( const ByteString& rPath, ScanFileList& rLst )
|
||||
{
|
||||
Dir aFiles( rPath, FSYS_KIND_FILE );
|
||||
for( USHORT i = 0; i < aFiles.Count(); ++i )
|
||||
|
||||
Loading…
Reference in New Issue
Block a user