pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Rename "common.mk" to "Makefile.common"
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Sun Nov 12 18:28:14 2017 +0100
Changeset: 43797adda487f3cfc88102823ca5070eba3933fc
Modified Files:
mingw-w64-gcc/Makefile
mingw-w64-libgcc/Makefile
Added Files:
mingw-w64-gcc/Makefile.common
Removed Files:
mingw-w64-gcc/common.mk
Log Message:
Rename "common.mk" to "Makefile.common"
I believe this is the more common practice.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=43797adda487f3cfc88102823ca5070eba3933fc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mingw-w64-gcc/Makefile | 2 +-
mingw-w64-gcc/Makefile.common | 56 +++++++++++++++++++++++++++++++++++++++++++
mingw-w64-gcc/common.mk | 53 ----------------------------------------
mingw-w64-libgcc/Makefile | 2 +-
4 files changed, 58 insertions(+), 55 deletions(-)
diffs:
diff --git a/mingw-w64-gcc/Makefile b/mingw-w64-gcc/Makefile
index 3ebb8df833..abd3d16d44 100644
--- a/mingw-w64-gcc/Makefile
+++ b/mingw-w64-gcc/Makefile
@@ -6,4 +6,4 @@ COMMENT= GNU C/C++ Compiler for win32/64 cross-development
BUILD_TARGET= all-gcc
INSTALL_TARGET= install-gcc
-.include "common.mk"
+.include "Makefile.common"
diff --git a/mingw-w64-gcc/Makefile.common b/mingw-w64-gcc/Makefile.common
new file mode 100644
index 0000000000..4e1a4ee9ad
--- /dev/null
+++ b/mingw-w64-gcc/Makefile.common
@@ -0,0 +1,56 @@
+# $NetBSD: common.mk,v 1.2 2012/10/03 15:09:55 asau Exp $
+#
+# used by wip/mingw-w64-gcc/Makefile
+# used by wip/mingw-w64-libgcc/Makefile
+
+DISTNAME= gcc-4.5.1
+CATEGORIES= cross
+MASTER_SITES= ${MASTER_SITE_GNU:=gcc/${DISTNAME}/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://gcc.gnu.org/
+LICENSE= gnu-gpl-v3
+
+DEPENDS+= mingw-w64-binutils-[0-9]*:../../wip/mingw-w64-binutils
+DEPENDS+= mingw-w64-headers-[0-9]*:../../wip/mingw-w64-headers
+
+DISTINFO_FILE= ${.CURDIR}/../mingw-w64-gcc/distinfo
+PATCHDIR= ${.CURDIR}/../mingw-w64-gcc/patches
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES= c c++
+GNU_CONFIGURE_PREFIX= ${PREFIX}/cross
+USE_TOOLS+= gmake flex bison makeinfo perl
+INFO_FILES= yes
+
+# XXX fixme: shared build is borked with sjlj
+CONFIGURE_ARGS+= --enable-sjlj-exceptions \
+ --disable-shared \
+ --enable-version-specific-runtime-libs \
+ --enable-fully-dynamic-string \
+ --disable-libssp \
+ --with-system-zlib \
+ --enable-languages=c,c++ \
+ --target=x86_64-w64-mingw32 \
+ --enable-targets=all
+
+CONFIGURE_DIRS= ../build
+BUILD_DIRS= ../build
+INSTALL_DIRS= ../build
+
+CONFIGURE_ENV+= CFLAGS_FOR_TARGET="-g -O2"
+CONFIGURE_ENV+= CXXFLAGS_FOR_TARGET="-g -O2"
+
+CONFIGURE_SCRIPT= ${WRKSRC}/configure
+
+post-extract:
+ mkdir ${WRKDIR}/build
+
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../math/mpcomplex/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mingw-w64-gcc/common.mk b/mingw-w64-gcc/common.mk
deleted file mode 100644
index 5b36439234..0000000000
--- a/mingw-w64-gcc/common.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: common.mk,v 1.2 2012/10/03 15:09:55 asau Exp $
-
-DISTNAME= gcc-4.5.1
-CATEGORIES= cross
-MASTER_SITES= ${MASTER_SITE_GNU:=gcc/${DISTNAME}/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://gcc.gnu.org/
-LICENSE= gnu-gpl-v3
-
-DEPENDS+= mingw-w64-binutils-[0-9]*:../../wip/mingw-w64-binutils
-DEPENDS+= mingw-w64-headers-[0-9]*:../../wip/mingw-w64-headers
-
-DISTINFO_FILE= ${.CURDIR}/../mingw-w64-gcc/distinfo
-PATCHDIR= ${.CURDIR}/../mingw-w64-gcc/patches
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-USE_LANGUAGES= c c++
-GNU_CONFIGURE_PREFIX= ${PREFIX}/cross
-USE_TOOLS+= gmake flex bison makeinfo perl
-INFO_FILES= yes
-
-# XXX fixme: shared build is borked with sjlj
-CONFIGURE_ARGS+= --enable-sjlj-exceptions \
- --disable-shared \
- --enable-version-specific-runtime-libs \
- --enable-fully-dynamic-string \
- --disable-libssp \
- --with-system-zlib \
- --enable-languages=c,c++ \
- --target=x86_64-w64-mingw32 \
- --enable-targets=all
-
-CONFIGURE_DIRS= ../build
-BUILD_DIRS= ../build
-INSTALL_DIRS= ../build
-
-CONFIGURE_ENV+= CFLAGS_FOR_TARGET="-g -O2"
-CONFIGURE_ENV+= CXXFLAGS_FOR_TARGET="-g -O2"
-
-CONFIGURE_SCRIPT= ${WRKSRC}/configure
-
-post-extract:
- mkdir ${WRKDIR}/build
-
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../math/mpcomplex/buildlink3.mk"
-.include "../../math/mpfr/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mingw-w64-libgcc/Makefile b/mingw-w64-libgcc/Makefile
index 8a13f2bf74..fd99553358 100644
--- a/mingw-w64-libgcc/Makefile
+++ b/mingw-w64-libgcc/Makefile
@@ -13,4 +13,4 @@ HAVE_FUNCS= _finitef _isnanf acosf acosl asinf asinl atan2f atan2l atanf atanl c
MAKE_ENV+= ac_cv_lib_m_sin=yes
MAKE_ENV+= ${HAVE_FUNCS:C/.*/ac_cv_func_&=yes/}
-.include "../../wip/mingw-w64-gcc/common.mk"
+.include "../../wip/mingw-w64-gcc/Makefile.common"
Home |
Main Index |
Thread Index |
Old Index