From cdb7e99dd692025819f4b6cd63791e52f09d1db7 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 15 Oct 2015 20:49:11 +1100 Subject: remove optional native pkgs and build-requirements target --- Makefile | 13 ++------- index.html | 81 ++++++++++++++++++-------------------------------------- src/autoconf.mk | 27 ------------------- src/automake.mk | 27 ------------------- src/bison.mk | 27 ------------------- src/coreutils.mk | 27 ------------------- src/flex.mk | 27 ------------------- src/gperf.mk | 27 ------------------- src/intltool.mk | 25 ----------------- src/libtool.mk | 10 +------ src/m4.mk | 29 -------------------- src/make.mk | 27 ------------------- src/sed.mk | 27 ------------------- 13 files changed, 29 insertions(+), 345 deletions(-) delete mode 100644 src/autoconf.mk delete mode 100644 src/automake.mk delete mode 100644 src/bison.mk delete mode 100644 src/coreutils.mk delete mode 100644 src/flex.mk delete mode 100644 src/gperf.mk delete mode 100644 src/intltool.mk delete mode 100644 src/m4.mk delete mode 100644 src/make.mk delete mode 100644 src/sed.mk diff --git a/Makefile b/Makefile index 5dbb519..a502416 100644 --- a/Makefile +++ b/Makefile @@ -326,11 +326,6 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) -BUILD_PKGS := $(call set_create, \ - $(foreach PKG, \ - $(shell grep -l 'BUILD_$$(BUILD)' '$(TOP_DIR)/src/'*.mk | \ - $(SED) -n 's,.*src/\(.*\)\.mk,\1,p'), \ - $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(BUILD))), $(PKG)))) # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules # and having to explicitly disable $(BUILD) for most packages @@ -356,10 +351,6 @@ PRINTF_FMT := printf '%-11s %-$(PKG_COL_WIDTH)s %-$(TARGET_COL_WIDTH)s %-1 .PHONY: download download: $(addprefix download-,$(PKGS)) -.PHONY: build-requirements -build-requirements: - @$(MAKE) -f '$(MAKEFILE)' $(BUILD_PKGS) MXE_TARGETS=$(BUILD) DONT_CHECK_REQUIREMENTS=true - define TARGET_RULE $(if $(findstring i686-pc-mingw32,$(1)), $(error Deprecated target specified: "$(1)". Please use \ @@ -709,7 +700,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) $(eval $(PKG)_BUILD_ONLY := $(false)) \ ✓, \ ✗)\n) \ - $(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \ + $(if $(call set_is_member,$(PKG),$($(BUILD)_PKGS)), \ $(eval $(PKG)_VIRTUAL := $(false)) \ ✓, \ ✗)\n \ @@ -731,7 +722,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) @echo '' >> $@ @$(foreach TARGET,$(MXE_TARGET_LIST), \ echo '$(words $($(TARGET)_PKGCOUNT))' >> $@;) - @echo '$(words $(BUILD_PKGS))' >> $@ + @echo '$(words $($(BUILD)_PKGS))' >> $@ @echo '' >> $@ @echo '' >> $@ @echo '' >> $@ diff --git a/index.html b/index.html index 4ccf9dc..7f1edb4 100644 --- a/index.html +++ b/index.html @@ -732,9 +732,8 @@ USE_OSGPLUGIN(<plugin2>)

Install - Xcode 5 + the latest Xcode

-

Step 1

Method 1 - MacPorts

Install MacPorts, @@ -742,31 +741,43 @@ USE_OSGPLUGIN(<plugin2>) 

sudo port install \
-    gdk-pixbuf2 glib2 intltool p5-xml-parser p7zip gpatch scons wget xz
+ autoconf automake bison cmake coreutils flex gettext \ + gdk-pixbuf2 glib2 gsed intltool libffi libtool openssl \ + p5-xml-parser p7zip scons wget xz +
Method 2 - Rudix

- Install Rudix you can make it with following command -

- 
curl -s https://raw.githubusercontent.com/rudix-mac/rpm/2014.6/rudix.py \
-    | sudo python - install rudix
-

+ Install Rudix, then run:

- 
sudo rudix install glib pkg-config scons wget xz
- Note: gdk-pixbuf2 is not installed in method 2, - so you can not build gtk3. -

Step 2

+ + 
sudo rudix install \
+    autoconf automake cmake coreutils gettext glib intltool \
+    libtool p7zip scons sed wget xz

- After installing pre-requirement run from within the mxe directory: + Note: gdk-pixbuf2 is not installed in method 2, + so you can not build gtk3. Other packages may be + missing on Rudix - please open an issue if you find any.

- 
make build-requirements

You may be prompted to install a java runtime - this is not required.

- Mac OS X versions ≤ 10.7 are no longer supported. + Mac OS X versions ≤ 10.9 are no longer tested.

+

+

Certain packages have open issues on OS X
+

+

+ to build the remainder of MXE, run: +

+ 
make EXCLUDE_PKGS='nsis ocaml%'
+

+ to see a list of all dependent downstream packages that + will be excluded, run: +

+ 
make show-downstream-deps-'nsis ocaml%'

openSUSE

@@ -1075,14 +1086,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) aubio - autoconf - autoconf - - - automake - automake - - db Oracle Berkeley DB @@ -1095,10 +1098,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) GNU Binutils - bison - bison - - blas blas @@ -1179,10 +1178,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) Coin3D - coreutils - GNU Core Utilities - - cppunit CppUnit @@ -1255,10 +1250,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) FLANN - flex - flex - - fltk FLTK @@ -1363,10 +1354,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) GnuTLS - gperf - GNU gperf - - graphicsmagick GraphicsMagick @@ -1471,10 +1458,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) ImageMagick - intltool - Intltool - - isl Integer Set Library @@ -1879,14 +1862,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) lzo - m4 - GNU M4 - - - make - GNU Make - - matio matio @@ -2387,10 +2362,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) SDL2_ttf - sed - GNU sed - - sfml SFML diff --git a/src/autoconf.mk b/src/autoconf.mk deleted file mode 100644 index 93c2ffb..0000000 --- a/src/autoconf.mk +++ /dev/null @@ -1,27 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := autoconf -$(PKG)_IGNORE := -$(PKG)_VERSION := 2.69 -$(PKG)_CHECKSUM := 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) -$(PKG)_DEPS := m4 - -define $(PKG)_UPDATE - $(WGET) -q -O- 'http://ftp.gnu.org/gnu/autoconf/?C=M;O=D' | \ - $(SED) -n 's,.*