diff options
| author | davilla <davilla@4pi.com> | 2011-10-12 22:51:49 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2011-10-13 00:54:51 -0400 |
| commit | 6777b009163f6c7b0f0836e04d2897d640f9799a (patch) | |
| tree | d6e4c9d59cc296147309af0877fefe0782538c44 /tools/darwin | |
| parent | fd2b074933533ac06f615ea0d3d3598de83249ee (diff) | |
[osx/ios] add gnu sed to darwin depends
Diffstat (limited to 'tools/darwin')
| -rw-r--r-- | tools/darwin/depends/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/darwin/depends/openssl/Makefile | 6 | ||||
| -rw-r--r-- | tools/darwin/depends/sed/Makefile | 38 |
3 files changed, 42 insertions, 4 deletions
diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in index a429802239..0584303ec2 100644 --- a/tools/darwin/depends/Makefile.in +++ b/tools/darwin/depends/Makefile.in @@ -1,6 +1,6 @@ include Makefile.include -BUILDTOOLS = gas-preprocessor help2man m4 autoconf automake libtool pkg-config yasm cmake tar dpkg +BUILDTOOLS = gas-preprocessor help2man m4 autoconf automake libtool pkg-config yasm cmake sed tar dpkg SUBDIRS := \ Backrow pcre expat gettext readline sqlite3 \ diff --git a/tools/darwin/depends/openssl/Makefile b/tools/darwin/depends/openssl/Makefile index 7d976c3b25..5f814b0b2b 100644 --- a/tools/darwin/depends/openssl/Makefile +++ b/tools/darwin/depends/openssl/Makefile @@ -28,9 +28,9 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore cd $(SOURCE); $(CONFIGURE) if test "$(DARWIN)" = "ios"; then \ - sed -i "" -e "s|CFLAG= |CFLAG=-arch armv7 -isysroot ${platform_sdk_path} |" "$(SOURCE)/Makefile"; \ - sed -i "" -e "s|-arch i386|-arch armv7|" "$(SOURCE)/Makefile"; \ - sed -i "" -e "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(SOURCE)/crypto/ui/ui_openssl.c"; \ + sed -ie "s|CFLAG= |CFLAG=-arch armv7 -isysroot ${platform_sdk_path} |" "$(SOURCE)/Makefile"; \ + sed -ie "s|-arch i386|-arch armv7|" "$(SOURCE)/Makefile"; \ + sed -ie "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(SOURCE)/crypto/ui/ui_openssl.c"; \ fi $(LIBDYLIB): $(SOURCE) diff --git a/tools/darwin/depends/sed/Makefile b/tools/darwin/depends/sed/Makefile new file mode 100644 index 0000000000..d07ea3b59a --- /dev/null +++ b/tools/darwin/depends/sed/Makefile @@ -0,0 +1,38 @@ +include ../Makefile.include + +# lib name, version +APPNAME=sed +VERSION=4.2.1 +SOURCE=$(APPNAME)-$(VERSION) +ARCHIVE=$(SOURCE).tar.gz + +# configuration settings +export PATH:=$(TOOLCHAIN)/bin:$(PATH) +CONFIGURE=./configure --prefix=$(TOOLCHAIN) + +APP=$(SOURCE)/bin/$(APPNAME) +APPBIN=$(TOOLCHAIN)/bin/$(APPNAME) + +all: $(APPBIN) + +$(TARBALLS_LOCATION)/$(ARCHIVE): + $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) + +$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) + rm -rf $(SOURCE) + $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + echo $(SOURCE) > .gitignore + cd $(SOURCE); $(CONFIGURE) + +$(APP): $(SOURCE) + make -j $(MAKE_JOBS) -C $(SOURCE) + +$(APPBIN): + make $(APP) + make -C $(SOURCE) install + +clean: + make -C $(SOURCE) clean + +distclean:: + rm -rf $(SOURCE) |