diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2020-01-26 18:22:20 +0100 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2020-01-26 18:22:21 +0100 |
| commit | 12037b3f29f72be080c6f23498e2a38d89d01232 (patch) | |
| tree | ff6935fb358e40cb25f130e05258d42e3e2eccc6 /libs | |
| parent | 893a804c957ea73c6060aa4964d5175432588f2d (diff) | |
apr: clean up the Makefile
- sort configure variables
- clean up installation defines (use macros, improve sed scripts,
remove gratuitous slashes & whitespaces)
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/apr/Makefile | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 281df24e1..edc8bc061 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -44,44 +44,41 @@ CONFIGURE_ARGS += \ # XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure CONFIGURE_VARS += \ + ac_cv_func_pthread_mutexattr_setpshared=yes \ + ac_cv_func_sem_open=yes \ ac_cv_sizeof_struct_iovec=1 \ ac_cv_struct_rlimit=yes \ - ac_cv_func_sem_open=yes \ - ac_cv_func_pthread_mutexattr_setpshared=yes \ + apr_cv_accept4=yes \ + apr_cv_dup3=yes \ + apr_cv_epoll=yes \ + apr_cv_epoll_create1=yes \ + apr_cv_mutex_recursive=yes \ apr_cv_mutex_robust_shared=yes \ - apr_cv_tcp_nodelay_with_cork=yes \ - apr_cv_sock_cloexec=yes \ apr_cv_process_shared_works=yes \ - apr_cv_mutex_recursive=yes \ - apr_cv_epoll_create1=yes \ - apr_cv_epoll=yes \ - apr_cv_dup3=yes \ - apr_cv_accept4=yes + apr_cv_sock_cloexec=yes \ + apr_cv_tcp_nodelay_with_cork=yes define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 - $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ - $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ - $(1)/usr/include/apr-1/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \ - $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ - $(1)/usr/lib/pkgconfig/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \ - $(1)/usr/share/build-1/ - $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config - $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apr-1-config - $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config - $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config - $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \ + $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1 + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ + $(1)/usr/bin + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ + $(1)/usr/include/apr-1 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ + $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1 + $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ + $(1)/usr/bin/apr-1-config + $(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config + $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \ + $(1)/usr/share/build-1/apr_rules.mk endef define Package/libapr/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib endef $(eval $(call BuildPackage,libapr)) |