This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/master by this push: new f92dfdd Drop obsolete build time workarounds for HP-UX f92dfdd is described below commit f92dfddd1396ed1a8c0fb07ec01383bde58363a9 Author: Michael Osipov <micha...@apache.org> AuthorDate: Wed Mar 25 13:21:13 2020 +0100 Drop obsolete build time workarounds for HP-UX This basically reverts BZ 60301 and BZ 60290. They were introduced due to lack of understanding how the rules.mk was built previously. It was obtained from the HP-UX Porting and Archive Centre which used GCC, but the default compiler is aCC on HP-UX. Both have different set of flags and options. GCC on HP-UX is basically dead. When both APR and Tomcat Native are built under same conditions no hacky workarounds are necessary. --- native/Makefile.in | 10 ---------- native/configure.in | 6 ------ xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/native/Makefile.in b/native/Makefile.in index 6e6c68a..2c4a5c8 100644 --- a/native/Makefile.in +++ b/native/Makefile.in @@ -21,8 +21,6 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ -CC_OLD = @CC@ -LIBTOOL_OLD = @LIBTOOL@ # gets substituted into some targets TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@ @@ -49,14 +47,6 @@ TARGETS = $(TARGET_LIB) @INCLUDE_RULES@ @INCLUDE_OUTPUTS@ -ifneq ($(CC_OLD),$(CC)) - CC=$(CC_OLD) -endif - -ifneq ($(LIBTOOL_OLD),$(LIBTOOL)) - LIBTOOL=$(LIBTOOL_OLD) -endif - LINK = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@ CLEAN_SUBDIRS = test diff --git a/native/configure.in b/native/configure.in index 9cc395f..3d2d9e1 100644 --- a/native/configure.in +++ b/native/configure.in @@ -101,11 +101,6 @@ dnl APR_SETIFNULL(CC, `$apr_config --cc`) APR_SETIFNULL(CPP, `$apr_config --cpp`) -dnl -dnl Default to the APR provided libtool but allow the user to override it -dnl -APR_SETIFNULL(LIBTOOL, `$apr_config --apr-libtool`) - AC_PROG_INSTALL dnl @@ -242,7 +237,6 @@ AC_SUBST(TCNATIVE_LDFLAGS) AC_SUBST(TCNATIVE_LIBS) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) -AC_SUBST(LIBTOOL) dnl copy apr's rules.mk into our build directory. if test ! -d ./build; then diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index d88bc79..b0d3ed0 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -36,6 +36,9 @@ </section> <section name="Changes in 1.2.24"> <changelog> + <update> + Drop obsolete build time workarounds for HP-UX. (michaelo) + </update> <add> Add support for FreeBSD's pthread_getthreadid_np() in our ssl_thread_id(void). (michaelo) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org