Skip to content

allow non-default exception handling targets #1664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starius merged 4 commits into from
Feb 11, 2017
Merged

allow non-default exception handling targets #1664

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5da8168
allow non-default exception handling targets
tonytheodore Feb 4, 2017
b8850b2
Makefile: add [POSIX | WIN32]_THREADS variable
tonytheodore Feb 7, 2017
1020d04
apr: fix posix build and use SOURCE_DIR etc.
tonytheodore Feb 7, 2017
bf6a782
libmysqlclient: fix redefinition of pthreads functions
tonytheodore Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apr: fix posix build and use SOURCE_DIR etc.
  • Loading branch information
@tonytheodore
tonytheodore committed Feb 7, 2017
commit 1020d040db43dc10ee1f37a8377030c4a124beaf
17 changes: 11 additions & 6 deletions src/apr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,23 @@ define $(PKG)_UPDATE
endef

define $(PKG)_BUILD
cp -Rp '$(1)' '$(1).native'
cd '$(1).native' && ./configure
cd '$(1).native' && $(MAKE) tools/gen_test_char \
CFLAGS='-DNEED_ENHANCED_ESCAPES'
cd '$(1)' && ./configure \
# native build for gen_test_char
mkdir '$(BUILD_DIR).native'
cd '$(BUILD_DIR).native' && '$(SOURCE_DIR)/configure'
$(MAKE) -C '$(BUILD_DIR).native' tools/gen_test_char \
CFLAGS='-DNEED_ENHANCED_ESCAPES' -j '$(JOBS)'

# cross build
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
ac_cv_sizeof_off_t=4 \
ac_cv_sizeof_pid_t=4 \
ac_cv_sizeof_size_t=4 \
ac_cv_sizeof_ssize_t=4 \
$(if $(POSIX_THREADS),apr_cv_mutex_robust_shared=yes) \
CFLAGS=-D_WIN32_WINNT=0x0500
$(MAKE) -C '$(1)' -j 1 install GEN_TEST_CHAR='$(1).native/tools/gen_test_char'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' GEN_TEST_CHAR='$(BUILD_DIR).native/tools/gen_test_char'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install

ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
endef