Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22835306 proftpd should be 64-bit
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 27 Apr 2016 14:09:04 -0700
changeset 5971 065a45513062
parent 5970 86291cd54b86
child 5972 e58388dcef63
22835306 proftpd should be 64-bit
components/proftpd/Makefile file | annotate | diff | comparison | revisions
components/proftpd/dtrace/Makefile file | annotate | diff | comparison | revisions
components/proftpd/proftpd.p5m file | annotate | diff | comparison | revisions 
--- a/components/proftpd/Makefile	Wed May 11 20:33:52 2016 -0700
+++ b/components/proftpd/Makefile	Wed Apr 27 14:09:04 2016 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-BUILD_BITS= 32
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		proftpd
@@ -62,14 +62,15 @@
 ifeq ($(OS_VERSION), 5.11)
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 endif
+LDFLAGS +=	-m$(BITS)
+LDFLAGS +=	-z guidance=nolazyload -z nolazyload -lbsm -z guidance=lazyload -z lazyload
 
 # Force immediate binding because of chroot().
-CONFIGURE_OPTIONS +=	LDFLAGS="-z guidance=nolazyload -z nolazyload -lbsm"
 CONFIGURE_OPTIONS +=	install_user=`id -nu`
 CONFIGURE_OPTIONS +=	install_group=`groups | cut -f 1 -d ' '`
 CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)
 CONFIGURE_OPTIONS +=	--localstatedir=$(VARDIR)/run
-CONFIGURE_OPTIONS +=	--libexecdir=$(USRLIBDIR)/proftpd
+CONFIGURE_OPTIONS +=	--libexecdir=$(USRLIBDIR)/proftpd/$(MACH64)
 CONFIGURE_OPTIONS +=	--enable-ipv6
 CONFIGURE_OPTIONS +=	--enable-ctrls
 CONFIGURE_OPTIONS +=	--enable-facl
@@ -96,7 +97,7 @@
 
 # Build Solaris dtrace object files and copy to proftpd build tree.
 COMPONENT_PRE_BUILD_ACTION = \
-	(cd dtrace && make CP="$(CP)" CC="$(CC)" BD="$(BUILD_DIR)/$(MACH32)")
+	(cd dtrace && make CP="$(CP)" CC="$(CC)" BD="$(BUILD_DIR)/$(MACH$(BITS))" BITS="$(BITS)")
 
 # proftpd configure and build is not ready for run out of the source tree
 CONFIGURE_SCRIPT =	$(@D)/configure
--- a/components/proftpd/dtrace/Makefile	Wed May 11 20:33:52 2016 -0700
+++ b/components/proftpd/dtrace/Makefile	Wed Apr 27 14:09:04 2016 -0700
@@ -1,14 +1,14 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 all:
 	$(CP) ftp_provider_impl.h $(BD)/modules
 	/usr/sbin/dtrace -xnolibs -C -h -s ftp_provider.d \
 		-o $(BD)/modules/ftp_provider.h
-	$(CC) -c ftp_provider_impl.c -I $(BD)/modules \
+	$(CC) -m$(BITS) -c ftp_provider_impl.c -I $(BD)/modules \
 		-o $(BD)/modules/ftp_provider_impl.o
-	/usr/sbin/dtrace -G -32 -xnolibs -C -s ftp_provider.d \
+	/usr/sbin/dtrace -G -$(BITS) -xnolibs -C -s ftp_provider.d \
 		-o "$(BD)"/modules/ftp_provider.o \
 		$(BD)/modules/ftp_provider_impl.o
 	echo "modules/ftp_provider_impl.o" >> $(BD)/module-libs.txt
--- a/components/proftpd/proftpd.p5m	Wed May 11 20:33:52 2016 -0700
+++ b/components/proftpd/proftpd.p5m	Wed Apr 27 14:09:04 2016 -0700
@@ -135,14 +135,14 @@
 file usr/sbin/proftpd path=usr/lib/inet/proftpd
 #
 # pkg-config
-file path=usr/lib/pkgconfig/proftpd.pc
+file usr/lib/$(MACH64)/pkgconfig/proftpd.pc path=usr/lib/pkgconfig/proftpd.pc
 #
 # modules
-file path=usr/lib/proftpd/mod_auth_gss.so
-file path=usr/lib/proftpd/mod_facl.so
-file path=usr/lib/proftpd/mod_gss.so
-file path=usr/lib/proftpd/mod_tls.so
-file path=usr/lib/proftpd/mod_wrap.so
+file path=usr/lib/proftpd/$(MACH64)/mod_auth_gss.so
+file path=usr/lib/proftpd/$(MACH64)/mod_facl.so
+file path=usr/lib/proftpd/$(MACH64)/mod_gss.so
+file path=usr/lib/proftpd/$(MACH64)/mod_tls.so
+file path=usr/lib/proftpd/$(MACH64)/mod_wrap.so
 #
 # sbin executables
 file ftprestart.sh path=usr/sbin/ftprestart
upstream/oracle/userland-gate