Browse Source

update to latest, we can simplify the build and enable server later

Waldemar Brodkorb 10 years ago
parent
commit
26d7f0ebfc
1 changed files with 15 additions and 42 deletions
  1. 15 42
      package/postgresql/Makefile

+ 15 - 42
package/postgresql/Makefile

@@ -1,66 +1,39 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		postgresql
-PKG_VERSION:=		9.3.4
-PKG_RELEASE:=		2
-PKG_HASH:=		7155b94c2abec7d05638463839ff403fdee8274d72a2bd280a7becdee4941540
+PKG_VERSION:=		9.4.1
+PKG_RELEASE:=		1
+PKG_HASH:=		43da2d54ff8333a2ee595efc3d0df3255bb46d4431841d2b88f9cfcd6366e234
 PKG_DESCR:=		postgresql database library
 PKG_SECTION:=		libs/db
-PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.postgresql.org/
-PKG_SITES:=		http://ftp.postgresql.org/pub/source/v9.3.4/
+PKG_SITES:=		http://ftp.postgresql.org/pub/source/v$(PKG_VERSION)/
 PKG_LIBNAME:=		libpq
+PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPQ,libpq,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-BUILD_STYLE:=           manual
-INSTALL_STYLE:=         manual
-PKG_CONFIGURE_ARGS:=	--disable-integer-datetimes \
-			--without-krb5 \
+CONFIGURE_ARGS+=	--disable-integer-datetimes \
 			--without-openssl \
 			--without-pam \
 			--without-perl \
 			--without-python \
 			--without-readline \
+			--without-zlib \
 			--without-bonjour \
 			--without-tcl \
-			--with-system-tzdata=${STAGING_TARGET_DIR} \
-			--with-zlib="yes"
-CONFIGURE_ARGS+=	${PKG_CONFIGURE_ARGS}
-
-pre-configure:
-	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		./configure \
-		--prefix=/usr \
-		${PKG_CONFIGURE_ARGS} \
-	);
-	${MAKE} -C "${WRKBUILD}/src/bin/pg_config" \
-		CC="${HOST_CC}" \
-		DESTDIR="${WRKINST}" \
-		all install
-
-do-build:
-	${MAKE} -C "${WRKBUILD}/src/include" \
-		DESTDIR="${WRKINST}" \
-		all install
-	${MAKE} -C "${WRKBUILD}/src/interfaces/libpq" \
-		DESTDIR="${WRKINST}" \
-		all install
+			--with-system-tzdata=$(STAGING_TARGET_DIR)
 
 libpq-install:
-	${INSTALL_DIR} ${IDIR_LIBPQ}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpq.so* ${IDIR_LIBPQ}/usr/lib
-	# workaround for dev subpackage
-	${INSTALL_DIR} ${IDIR_LIBPQ_DEV}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/pg_config \
-		${IDIR_LIBPQ_DEV}/usr/bin
+	$(INSTALL_DIR) $(IDIR_LIBPQ)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpq.so* $(IDIR_LIBPQ)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk