summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael D. Stemle, Jr <themanchicken@gmail.com>2018-10-02 22:20:14 -0400
committerMichael D. Stemle, Jr <themanchicken@gmail.com>2018-10-02 22:20:14 -0400
commit96668a9c6d9adcd8d7f47a5a21aca777d2ef461b (patch)
tree74afb55c326b4af5de36c8b1f102843b08545005
parent24fd806e6bc938e7f15dbbe19be0be102fe84972 (diff)
downloadlibfaketime-96668a9c6d9adcd8d7f47a5a21aca777d2ef461b.tar.gz
Fixing a couple of issues I just found.
-rw-r--r--README11
-rw-r--r--TODO1
-rw-r--r--src/Makefile.am4
3 files changed, 5 insertions, 11 deletions
diff --git a/README b/README
index 18c910e..5e6640d 100644
--- a/README
+++ b/README
@@ -119,13 +119,10 @@ not need this feature or if it confuses the application you want to use FTPL
with, define the environment variable NO_FAKE_STAT, and the intercepted stat
calls will be passed through unaltered.
-On macOS, it is necessary to compile differently, due to the different
-behavior dyld has. Use the Makefile.OSX file provided to compile
-libfaketime.1.dylib. Additionally, instead of using LD_PRELOAD,
-the variable DYLD_INSERT_LIBRARIES should be set to the path to
-libfaketime.1.dylib, and the variable DYLD_FORCE_FLAT_NAMESPACE should be
-set (to anything). macOS users should read README.OSX for additional
-details.
+On macOS, instead of using LD_PRELOAD, the variable DYLD_INSERT_LIBRARIES
+should be set to the path to libfaketime.0.dylib, and the variable
+DYLD_FORCE_FLAT_NAMESPACE should be set (to anything). macOS users should
+read README.OSX for additional details.
NOTE: When committing, clean up potentially non-portable files with:
diff --git a/TODO b/TODO
index b8c801c..a6eeec7 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,5 @@ Open issues / next steps for libfaketime development
- use the testing framework to also implement unit tests
- fake timer_create and friends
- work around thread local storage issue, e.g., by using pthreads
-- add autoconf/automake support to get rid of separate Makefile.OSX
- improve pthread support
diff --git a/src/Makefile.am b/src/Makefile.am
index e8fd679..aedd448 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,9 +11,7 @@ if SOLARIS
AM_CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
AM_LDFLAGS += -Wl,--version-script=libfaketime.map
endif
-if MACOS
- AM_LDFLAGS += -dynamiclib -current_version 0.9.7 -compatibility_version 0.7
-else
+if !MACOS
AM_CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_PTHREAD -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC
endif