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

Collapse All | Expand All

(-)file_not_specified_in_diff (-40 / +44 lines)
Line 26 Link Here
26
	# Respect CFLAGS
27
	epatch "${FILESDIR}"/${PN}-1.24-Makefile.patch
Line 27 Link Here
27
	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" buildgcc/Makefile
29
	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" build/gcc/Makefile
28
--
Lines 29-33 Link Here
29
	sed -i -e \
31
	if use java ; then
30
	    "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
32
		sed -i -e \
31
	    buildgcc/Makefile || die "sed failed"
33
			"s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
32
	# respect CFLAGS, remove strip and other hard-coded crap
34
			build/gcc/Makefile || die "sed failed"
33
	epatch "${FILESDIR}"/${PN}-1.22-Makefile.patch
35
	fi
34
--
Line 37 Link Here
37
	cd buildgcc
39
	cd build/gcc
38
--
Lines 39-40 Link Here
39
	emake CXX="$(tc-getCXX)" all $(use java && echo javaall) \
41
	if use debug ; then
40
	    || die "build failed"
42
		# Build debug target
41
--
43
		emake CXX="$(tc-getCXX)" debug staticdebug \
44
			$(use java && echo javadebug) $(use libs && echo shareddebug) \
45
			|| die "make debug failed"
46
	else
47
		# Build release target
48
		emake CXX="$(tc-getCXX)" release static $(use java && echo java) \
49
			$(use libs && echo shared) || die "make release failed"
50
	fi
Line 44 Link Here
54
	cd build/gcc
55
Lines 45-55 Link Here
45
	    newbin bin/astyled astyle || die "install debug bin failed"
57
		newbin bin/astyled astyle || die "install debug bin failed"
46
	    newlib.a bin/libastyled.a libastyle.a  \
58
		newlib.a bin/libastyled.a libastyle.a  \
47
		|| die "install debug static lib failed"
59
			|| die "install debug static lib failed"
48
	    if use libs ; then
60
		if use libs ; then
49
		newlib.so bin/libastyled.so libastyle.so \
61
			newlib.so bin/libastyled.so libastyle.so \
50
		    || die "install debug shared lib failed"
62
				|| die "install debug shared lib failed"
51
		if use java ; then
63
			if use java ; then
52
		    local j_dir="/usr/$(get_libdir)"
64
				local j_dir="/usr/$(get_libdir)"
53
		    dolib.so bin/libastylejd.so \
65
				dolib.so bin/libastylejd.so \
54
			|| die "install debug shared java lib failed"
66
					|| die "install debug shared java lib failed"
55
		    java-pkg_regso "${D}${j_dir}/libastylejd.so"
67
				java-pkg_regso "${D}${j_dir}/libastylejd.so"
56
--
68
			fi
Line 57 Link Here
57
	    fi
Lines 59-65 Link Here
59
	    if use libs ; then
71
		if use libs ; then
60
		dolib.so bin/libastyle.so || die "install shared lib failed"
72
			dolib.so bin/libastyle.so || die "install shared lib failed"
61
		if use java ; then
73
			if use java ; then
62
		    local j_dir="/usr/$(get_libdir)"
74
				local j_dir="/usr/$(get_libdir)"
63
		    dolib.so bin/libastylej.so \
75
				dolib.so bin/libastylej.so \
64
			|| die "install shared java lib failed"
76
					|| die "install shared java lib failed"
65
		    java-pkg_regso "${D}${j_dir}/libastylej.so"
77
				java-pkg_regso "${D}${j_dir}/libastylej.so"
66
--
78
			fi
Lines 67-69 Link Here
67
	    fi
80
		dobin bin/astyle || die "install bin failed"
68
	    dobin bin/astyle || die "install bin failed"
81
		dolib.a bin/libastyle.a || die "install static lib failed"
69
	    dolib.a bin/libastyle.a || die "install static lib failed"
70
--
Line 71 Link Here
71
	dohtml doc/*.html
83
	dohtml "${S}"/doc/*
72
--

Return to bug 311281