Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d12445959551005756e52ddc850977c6524c995d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d12445959551005756e52ddc850977c6524c995d)
  • Date: Mon, 25 Mar 2013 07:58:50 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

utils/installwatch/0001-fix-signatures.patch | 54
+++++++++++++++++++++++++++
utils/installwatch/HISTORY | 4 ++
utils/installwatch/PRE_BUILD | 2 +
3 files changed, 60 insertions(+)

New commits:
commit d12445959551005756e52ddc850977c6524c995d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/installwatch: fix function signatures

diff --git a/utils/installwatch/0001-fix-signatures.patch
b/utils/installwatch/0001-fix-signatures.patch
new file mode 100644
index 0000000..314d2e9
--- /dev/null
+++ b/utils/installwatch/0001-fix-signatures.patch
@@ -0,0 +1,54 @@
+From 610312e2fc22108d3401f91c4e2ade653ada0596 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 25 Mar 2013 13:42:19 +0100
+Subject: [PATCH 1/2] fix signatures
+
+---
+ installwatch.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/installwatch.c b/installwatch.c
+index 8004b5b..e67f511 100644
+--- a/installwatch.c
++++ b/installwatch.c
+@@ -2956,13 +2956,8 @@ struct dirent *readdir(DIR *dir) {
+ return result;
+ }
+
+-#if (GLIBC_MINOR <= 4)
+-int readlink(const char *path,char *buf,size_t bufsiz) {
+- int result;
+-#else
+ ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
+ ssize_t result;
+-#endif
+ instw_t instw;
+ int status;
+
+@@ -3097,11 +3092,7 @@ int rmdir(const char *pathname) {
+
+ int scandir( const char *dir,struct dirent ***namelist,
+ int (*select)(const struct dirent *),
+-#if (GLIBC_MINOR >= 10)
+ int (*compar)(const struct dirent **,const struct dirent **)
) {
+-#else
+- int (*compar)(const void *,const void *) ) {
+-#endif
+ int result;
+
+ if (!libc_handle)
+@@ -3713,11 +3704,7 @@ struct dirent64 *readdir64(DIR *dir) {
+
+ int scandir64( const char *dir,struct dirent64 ***namelist,
+ int (*select)(const struct dirent64 *),
+-#if (GLIBC_MINOR >= 10)
+ int (*compar)(const struct dirent64 **,const struct dirent64
**) ) {
+-#else
+- int (*compar)(const void *,const void *) ) {
+-#endif
+ int result;
+
+ if (!libc_handle)
+--
+1.8.1.2
+
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 49ff536..072335b 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,7 @@
+2013-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-signatures.patch: fix function signatures to
match
+ current versions of glibc
+
2012-10-31 Ladislav Hagara <hgr AT vabo.cz>
* installwatch-glibc-2.13.patch: glibc 2.15 and 2.16 cases added

diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
index 742685b..abfb23a 100755
--- a/utils/installwatch/PRE_BUILD
+++ b/utils/installwatch/PRE_BUILD
@@ -6,6 +6,8 @@ patch -p 1 < $SPELL_DIRECTORY/installwatch-glibc-2.13.patch &&
patch -p 1 < $SPELL_DIRECTORY/installwatch-relpath.patch &&
sed -i "s:PREFIX=/usr/local:PREFIX=/usr:" Makefile &&

+patch -p1 < $SPELL_DIRECTORY/0001-fix-signatures.patch &&
+
# due to the compatibility with stable sorcery
sed -i "s,INSTW_LOGFILE,INSTALLWATCHFILE,g" installwatch* &&
sed -i "/log.*access/ d" installwatch.c



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d12445959551005756e52ddc850977c6524c995d), Florian Franzmann, 03/25/2013

Archive powered by MHonArc 2.6.24.

Top of Page