From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:20:09 +0200 Subject: Revert "fix conflict, autoseect libgcj" This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04. --- package/libpthread/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpthread/Makefile') diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 579f24990..169db676a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -48,7 +48,7 @@ libpthread-dev-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/usr/lib ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD}/usr/lib/libpthread.so - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared*.a ${IDIR_LIBPTHREAD}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:21:13 +0200 Subject: I am to tupid for git, today. Revert "Revert "fix conflict, autoseect libgcj"" This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a. --- package/libpthread/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpthread/Makefile') diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 169db676a..579f24990 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -48,7 +48,7 @@ libpthread-dev-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/usr/lib ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD}/usr/lib/libpthread.so - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared*.a ${IDIR_LIBPTHREAD}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From a366efd9072c89902be45145f9d5b8781cfabd43 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 5 Apr 2011 19:08:15 +0200 Subject: fix wrong install dirs --- package/libpthread/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'package/libpthread/Makefile') diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index 579f24990..f91be0dc7 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -20,19 +20,20 @@ endif PKG_NAME:= libpthread PKG_DESCR:= POSIX threading library PKG_SECTION:= libs +PKG_OPTS:= noremove NO_DISTFILES:= 1 PKG_SUBPKGS:= LIBPTHREAD LIBPTHREAD_DEV ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPTHREAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBPTHREAD_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -46,9 +47,9 @@ endif libpthread-dev-install: ifeq ($(ADK_NATIVE),) - ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/usr/lib - ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD}/usr/lib/libpthread.so - ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared*.a ${IDIR_LIBPTHREAD}/usr/lib + ${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib + ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 2bf604ffc3707110490658b3d2004da62767722b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 7 Apr 2011 14:11:08 +0200 Subject: update some packages after libpng15 update, misc stuff --- package/libpthread/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/libpthread/Makefile') diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index f91be0dc7..4d61d570a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -25,6 +25,7 @@ PKG_OPTS:= noremove NO_DISTFILES:= 1 PKG_SUBPKGS:= LIBPTHREAD LIBPTHREAD_DEV +PKGSC_LIBPTHREAD_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly @@ -33,7 +34,7 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPTHREAD_DEV},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual -- cgit v1.2.3