Attachment #172620 for bug #210926

Lines 41-51 Link Here

(-)bsd.linux-apps.mk (-2 / +2 lines)
41		41
42	#new	42	#new
43	. if defined(OVERRIDE_LINUX_NONBASE_PORTS)	43	. if defined(OVERRIDE_LINUX_NONBASE_PORTS)
44	. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"	44	. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} == "c7" \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} == "c7_64"
45	LINUX_DIST_SUFFIX= -${OVERRIDE_LINUX_NONBASE_PORTS}	45	LINUX_DIST_SUFFIX= -${OVERRIDE_LINUX_NONBASE_PORTS}
46	LINUX_BASEPORT_NAME= -${OVERRIDE_LINUX_NONBASE_PORTS:S/_64//}	46	LINUX_BASEPORT_NAME= -${OVERRIDE_LINUX_NONBASE_PORTS:S/_64//}
47	. else	47	. else
48	IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\", \"c6\", and \"c6_64\"	48	IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"c7\", \"c7_64", \"f10\", \"c6\", and \"c6_64\"
49	. endif	49	. endif
50	. elif defined(USE_LINUX)	50	. elif defined(USE_LINUX)
51	LINUX_DIST_SUFFIX= -${USE_LINUX}	51	LINUX_DIST_SUFFIX= -${USE_LINUX}

Lines 12-17 Link Here

(-)bsd.linux-rpm.mk (-8 / +23 lines)
12	# e.g. 10 for fedora 10	12	# e.g. 10 for fedora 10
13	# Valid values for "centos": all version numbers	13	# Valid values for "centos": all version numbers
14	# e.g. 6.8 for centos 6.8	14	# e.g. 6.8 for centos 6.8
		15	# Valid values for "centos7": all version numbers
		16	# e.g. 7.2.1511 for centos 7.2.1511
15	# This is used to set MASTER_SITE_{,SRC_}SUBDIR	17	# This is used to set MASTER_SITE_{,SRC_}SUBDIR
16	# if it isn't already set.	18	# if it isn't already set.
17	# MASTER_SITE_SRC_SUBDIR	19	# MASTER_SITE_SRC_SUBDIR
Lines 61-66 Link Here
61	USE_LINUX?= "f10"	63	USE_LINUX?= "f10"
62	LINUX_DIST= fedora	64	LINUX_DIST= fedora
63	LINUX_DIST_VER= 10	65	LINUX_DIST_VER= 10
		66	.elif ${USE_LINUX} == "c7" \|\| ${USE_LINUX} == "c7_64"
		67	LINUX_DIST= centos7
		68	LINUX_DIST_VER= 7.2.1511
64	.else # default to CentOS	69	.else # default to CentOS
65	LINUX_DIST= centos	70	LINUX_DIST= centos
66	LINUX_DIST_VER= 6.8	71	LINUX_DIST_VER= 6.8
Lines 86-95 Link Here
86	updates/${LINUX_DIST_VER}/SRPMS	91	updates/${LINUX_DIST_VER}/SRPMS
87	. endif	92	. endif
88	. endif	93	. endif
89	. elif ${LINUX_DIST} == "centos"	94	. elif ${LINUX_DIST} == "centos" \|\| ${LINUX_DIST} == "centos7"
90	MASTER_SITES?= ${MASTER_SITE_CENTOS_LINUX} ${MASTER_SITE_CENTOS_LINUX_UPDATES}	95	MASTER_SITES?= ${MASTER_SITE_CENTOS_LINUX} ${MASTER_SITE_CENTOS_LINUX_UPDATES}
91	MASTER_SITE_SUBDIR?= centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \	96	MASTER_SITE_SUBDIR?= centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages \
92	centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/	97	centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages
93	. if ${LINUX_DIST_VER} == "5" #needed for Qt...	98	. if ${LINUX_DIST_VER} == "5" #needed for Qt...
94	LINUX_RPM_ARCH= i386	99	LINUX_RPM_ARCH= i386
95	MASTER_SITE_SUBDIR= centos/5/os/i386/Packages/	100	MASTER_SITE_SUBDIR= centos/5/os/i386/Packages/
Lines 97-107 Link Here
97	. if defined(PACKAGE_BUILDING)	102	. if defined(PACKAGE_BUILDING)
98	_SRC_GROUP=:SOURCE	103	_SRC_GROUP=:SOURCE
99	MASTER_SITES+= http://vault.centos.org/%SUBDIR%/:SOURCE	104	MASTER_SITES+= http://vault.centos.org/%SUBDIR%/:SOURCE
100	MASTER_SITE_SUBDIR+= ${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE	105	MASTER_SITE_SUBDIR+= ${LINUX_DIST_VER}/os/Source/SPackages:SOURCE
101	. endif	106	. endif
102	. endif	107	. endif
103	.endif	108	.endif
104		109
		110	.if ${USE_LINUX} == "c7_64"
		111	LINUX_REPO_ARCH= x86_64
		112	LINUX_RPM_ARCH= x86_64
		113	.endif
		114
105	PKGNAMEPREFIX?= linux-${USE_LINUX}-	115	PKGNAMEPREFIX?= linux-${USE_LINUX}-
106		116
107	# DISTFILES and SRC_DISTFILES assume that there is only one bindist	117	# DISTFILES and SRC_DISTFILES assume that there is only one bindist
Lines 118-124 Link Here
118	WRKSRC:= ${WRKSRC:S/-${RPMVERSION}$//}	128	WRKSRC:= ${WRKSRC:S/-${RPMVERSION}$//}
119		129
120	# Define files to install.	130	# Define files to install.
121	# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS) is off,	131	# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS is off),
122	# they can want to install both 32bit and 64bit things of only one package,	132	# they can want to install both 32bit and 64bit things of only one package,
123	# or they can want to install a 64bit only binary and e.g. 32/64bit libraries.	133	# or they can want to install a 64bit only binary and e.g. 32/64bit libraries.
124		134
Lines 125-131 Link Here
125	# The following glue is supposed to handle this.	135	# The following glue is supposed to handle this.
126	# FIXME: Sensibly refactor this part, it looks like spaghetti.	136	# FIXME: Sensibly refactor this part, it looks like spaghetti.
127		137
128	. if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"	138	. if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ( ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" \|\| \
		139	${OVERRIDE_LINUX_NONBASE_PORTS} == "c7_64" )
129	_32BIT_LINUX_RPM_ARCH= i686	140	_32BIT_LINUX_RPM_ARCH= i686
130	. if ${DISTFILES} == ${DISTNAME}${EXTRACT_SUFX} && ${USE_LINUX_RPM} != "nolib"	141	. if ${DISTFILES} == ${DISTNAME}${EXTRACT_SUFX} && ${USE_LINUX_RPM} != "nolib"
131	_32BIT_LIB_DISTFILES:= ${DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}	142	_32BIT_LIB_DISTFILES:= ${DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}
Lines 146-152 Link Here
146	. endif	157	. endif
147		158
148	.if !defined(USE_LINUX_RPM_BAD_PERMS)	159	.if !defined(USE_LINUX_RPM_BAD_PERMS)
149	EXTRACT_CMD?= ${TAR}	160	EXTRACT_CMD?= ${TAR}
150	EXTRACT_BEFORE_ARGS?= --no-same-permissions --no-same-owner -xf	161	EXTRACT_BEFORE_ARGS?= --no-same-permissions --no-same-owner -xf
151	EXTRACT_AFTER_ARGS?=	162	EXTRACT_AFTER_ARGS?=
152	.else	163	.else
Lines 187-195 Link Here
187	_LINUX_BASE_SUFFIX= c6	198	_LINUX_BASE_SUFFIX= c6
188	. elif ${USE_LINUX} == "c6_64"	199	. elif ${USE_LINUX} == "c6_64"
189	_LINUX_BASE_SUFFIX= c6	200	_LINUX_BASE_SUFFIX= c6
		201	. elif ${USE_LINUX} == "c7"
		202	_LINUX_BASE_SUFFIX== c7
		203	. elif ${USE_LINUX} == "c7_64"
		204	_LINUX_BASE_SUFFIX== c7_64
190	. else	205	. else
191	# other linux_base ports do not provide a pkg-plist file	206	# other linux_base ports do not provide a pkg-plist file
192	IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\", \"c6\", and \"c6_64\"	207	IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"c7\", \"c7_64\", \"f10\", \"c6\", and \"c6_64\"
193	. endif	208	. endif
194		209
195	PLIST?= ${WRKDIR}/.PLIST.linux-rpm	210	PLIST?= ${WRKDIR}/.PLIST.linux-rpm

Return to bug 210926