Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 488214 | Differences between
and this patch

Collapse All | Expand All

(-)freebsd-lib-9.2_rc3.ebuild (-7 / +14 lines)
Lines 36-41 Link Here
36
		>=dev-libs/expat-2.0.1
36
		>=dev-libs/expat-2.0.1
37
		!sys-libs/libutempter
37
		!sys-libs/libutempter
38
		!dev-libs/libelf
38
		!dev-libs/libelf
39
		!dev-libs/libexecinfo
39
		!sys-freebsd/freebsd-headers"
40
		!sys-freebsd/freebsd-headers"
40
	DEPEND="${RDEPEND}
41
	DEPEND="${RDEPEND}
41
		>=sys-devel/flex-2.5.31-r2
42
		>=sys-devel/flex-2.5.31-r2
Lines 78-84 Link Here
78
	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
79
	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
79
	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
80
	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
80
81
81
	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
82
	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= WITHOUT_ICONV= "
82
83
83
	if [ "${CTARGET}" != "${CHOST}" ]; then
84
	if [ "${CTARGET}" != "${CHOST}" ]; then
84
		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
85
		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
Lines 89-97 Link Here
89
PATCHES=(
90
PATCHES=(
90
	"${FILESDIR}/${PN}-6.0-pmc.patch"
91
	"${FILESDIR}/${PN}-6.0-pmc.patch"
91
	"${FILESDIR}/${PN}-6.1-csu.patch"
92
	"${FILESDIR}/${PN}-6.1-csu.patch"
92
	"${FILESDIR}/${PN}-9.2-liblink.patch"
93
	"${FILESDIR}/${PN}-10.0-liblink.patch"
94
	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
95
	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
93
	"${FILESDIR}/${PN}-bsdxml2expat.patch"
96
	"${FILESDIR}/${PN}-bsdxml2expat.patch"
94
	"${FILESDIR}/${PN}-9.0-netware.patch"
95
	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
97
	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
96
	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
98
	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
97
	)
99
	)
Lines 175-181 Link Here
175
	fi
177
	fi
176
178
177
	if ! is_crosscompile ; then
179
	if ! is_crosscompile ; then
178
		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
180
		if [[ ${PV} != *9999* ]]; then
181
			ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
182
		fi
179
	else
183
	else
180
		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
184
		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
181
			"${S}/libc/rpc/Makefile.inc" \
185
			"${S}/libc/rpc/Makefile.inc" \
Lines 302-307 Link Here
302
		mkdir "${WORKDIR}/include_proper_${ABI}" || die
306
		mkdir "${WORKDIR}/include_proper_${ABI}" || die
303
		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
307
		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
304
		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
308
		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
309
		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
305
	fi
310
	fi
306
	bootstrap_csu
311
	bootstrap_csu
307
	bootstrap_libssp_nonshared
312
	bootstrap_libssp_nonshared
Lines 318-323 Link Here
318
		do_bootstrap
323
		do_bootstrap
319
	else
324
	else
320
		CFLAGS="${CFLAGS} -isystem /usr/include"
325
		CFLAGS="${CFLAGS} -isystem /usr/include"
326
		CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
321
	fi
327
	fi
322
328
323
	export RAW_LDFLAGS=$(raw-ldflags)
329
	export RAW_LDFLAGS=$(raw-ldflags)
Lines 341-347 Link Here
341
	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
347
	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
342
348
343
	cd "${WORKDIR}/include"
349
	cd "${WORKDIR}/include"
344
	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
350
	WITHOUT_ICONV= $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
345
351
346
	use crosscompile_opts_headers-only && return 0
352
	use crosscompile_opts_headers-only && return 0
347
353
Lines 360-365 Link Here
360
		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
366
		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
361
		mymakeopts="${mymakeopts} NLS="
367
		mymakeopts="${mymakeopts} NLS="
362
		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
368
		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
369
		CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
363
		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
370
		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
364
	fi
371
	fi
365
372
Lines 582-588 Link Here
582
	local MACHINE="$(tc-arch-kernel)"
589
	local MACHINE="$(tc-arch-kernel)"
583
590
584
	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
591
	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
585
	$(freebsd_get_bmake) installincludes \
592
	WITHOUT_ICONV= $(freebsd_get_bmake) installincludes \
586
		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
593
		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
587
		DESTDIR="${DESTDIR}" \
594
		DESTDIR="${DESTDIR}" \
588
		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
595
		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
Lines 592-598 Link Here
592
	for i in $EXTRA_INCLUDES; do
599
	for i in $EXTRA_INCLUDES; do
593
		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
600
		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
594
		cd "${WORKDIR}/$i" || die
601
		cd "${WORKDIR}/$i" || die
595
		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
602
		WITHOUT_ICONV= $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
596
			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
603
			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
597
			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
604
			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
598
			BINGRP="${BINGRP}" || die "problem installing $i includes."
605
			BINGRP="${BINGRP}" || die "problem installing $i includes."

Return to bug 488214