diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-04-20 03:54:18 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-04-20 03:54:18 (GMT) |
| commit | 5e50e5146be6b9e1a7007273673bf535919daadf (patch) | |
| tree | 1d6eaa8fe73120cdee9b4e7a3e4b72d8e523d5b0 | |
| parent | 0f2849ed8b25491b0ec892ddceedc0b4dc256cb9 (diff) | |
| download | mxe-5e50e5146be6b9e1a7007273673bf535919daadf.zip mxe-5e50e5146be6b9e1a7007273673bf535919daadf.tar.gz mxe-5e50e5146be6b9e1a7007273673bf535919daadf.tar.bz2 | |
Enable shared builds for libgnurx
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
| -rw-r--r-- | src/libgnurx-1-additional-makefile-rules.patch | 27 | ||||
| -rw-r--r-- | src/libgnurx.mk | 7 |
2 files changed, 30 insertions, 4 deletions
diff --git a/src/libgnurx-1-additional-makefile-rules.patch b/src/libgnurx-1-additional-makefile-rules.patch new file mode 100644 index 0000000..1a78809 --- /dev/null +++ b/src/libgnurx-1-additional-makefile-rules.patch @@ -0,0 +1,27 @@ +This file is part of MXE. +See index.html for further information. + +diff -Nur mingw-libgnurx-2.5.1/Makefile.mxe mingw-libgnurx-2.5.1-mxe/Makefile.mxe +--- mingw-libgnurx-2.5.1/Makefile.mxe 1970-01-01 01:00:00.000000000 +0100 ++++ mingw-libgnurx-2.5.1-mxe/Makefile.mxe 2011-10-23 16:57:18.579312050 +0200 +@@ -0,0 +1,20 @@ ++include Makefile ++ ++libgnurx.a: $(OBJECTS) ++ rm -f $@ ++ $(TARGET)-ar rcu $@ $(OBJECTS) ++ $(TARGET)-ranlib $@ ++ ++install-common: ++ mkdir -p ${includedir} ${libdir} ++ cp -p ${srcdir}/regex.h ${includedir} ++ ++install-static: install-common libgnurx.a ++ cp -p ${srcdir}/libgnurx.a ${libdir} ++ ln -sf ${libdir}/libgnurx.a ${libdir}/libregex.a ++ ++install-shared: install-common libgnurx-$(DLLVERSION).dll libgnurx.dll.a ++ cp -p ${srcdir}/libgnurx.dll.a ${libdir} ++ cp -p ${srcdir}/libgnurx-$(DLLVERSION).dll ${bindir} ++ ln -sf ${libdir}/libgnurx.dll.a ${libdir}/libregex.dll.a ++ ln -sf ${bindir}/libgnurx-$(DLLVERSION).dll ${bindir}/libregex-$(DLLVERSION).dll diff --git a/src/libgnurx.mk b/src/libgnurx.mk index d71e365..d279fe6 100644 --- a/src/libgnurx.mk +++ b/src/libgnurx.mk @@ -23,8 +23,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install-static - ln -sf '$(PREFIX)/$(TARGET)/lib/libgnurx.a' '$(PREFIX)/$(TARGET)/lib/libregex.a' + $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' \ + $(if $(BUILD_STATIC),install-static,install-shared) \ + TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef - -$(PKG)_BUILD_SHARED = |