Overview
| Comment: | Fixed bug where paths were added multiple times | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | packages | 
| Files: | files | file ages | folders | 
| SHA1: | fc15516eae368c2991d71e18b5bf01ab | 
| User & Date: | rkeene on 2014-11-20 20:59:56 | 
| Other Links: | branch diff | manifest | tags | 
Context
| 2014-11-20 | ||
| 21:00 | Added start of ffmpeg build recipe check-in: 651b8c103c user: rkeene tags: packages | |
| 20:59 | Fixed bug where paths were added multiple times check-in: fc15516eae user: rkeene tags: packages | |
| 18:51 | Added start of ffmpeg build check-in: 9b4716dc28 user: rkeene tags: packages | |
Changes
Modified build from [f00e54c206] to [3e68dc7fb5].
| ︙ | ︙ | |||
| 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | 
						if [ -d "${pkgconfigdir}" ]; then
							PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${pkgconfigdir}"
							export PKG_CONFIG_PATH
						fi
						;;
				esac
			done
		done
		if [ "${pkgfound}" = '0' ]; then
			die "Package ${pkg}/${pkgversion:-*}@${pkgdomain} not found."
		fi
	done
}
 | > > | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | 
						if [ -d "${pkgconfigdir}" ]; then
							PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${pkgconfigdir}"
							export PKG_CONFIG_PATH
						fi
						;;
				esac
			done
			break
		done
		if [ "${pkgfound}" = '0' ]; then
			die "Package ${pkg}/${pkgversion:-*}@${pkgdomain} not found."
		fi
	done
}
 | 
| ︙ | ︙ | |||
| 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 | 
	if [ ! -f "${dynlinker}" ]; then
		die 'glibc directory is not available (appfs running/working?)'
	fi
	gcc_default_headers="$(echo '' | ${CPP:-cpp} -v 2>&1 | sed '/^End of search list/,$ d;0,/search starts here:$/ d' | grep '/gcc/' | sed 's@^ *@-isystem @' | tr $'\n' ' ')"
	CC="${CC:-gcc} -nostdinc ${gcc_default_headers} -isystem ${glibcdir}/include"
	if ! echo " ${require[*]} " | grep ' linux-headers[/@: ]' >/dev/null; then
		CC="${CC} -isystem ${linuxheadersdir}/include"
	fi
	BUILD_CC="${CC}"
	HOST_CC="${CC}"
	LDFLAGS="${LDFLAGS} -L${glibcdir}/lib -Wl,-rpath,${glibcdir}/lib -Wl,--dynamic-linker,${dynlinker}"
	if [ -z "${appfs_build_no_default_symver}" ]; then
 | > > | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | 
	if [ ! -f "${dynlinker}" ]; then
		die 'glibc directory is not available (appfs running/working?)'
	fi
	gcc_default_headers="$(echo '' | ${CPP:-cpp} -v 2>&1 | sed '/^End of search list/,$ d;0,/search starts here:$/ d' | grep '/gcc/' | sed 's@^ *@-isystem @' | tr $'\n' ' ')"
	CC="${CC:-gcc} -nostdinc ${gcc_default_headers} -isystem ${glibcdir}/include"
	CXX="${CXX:-g++} -nostdinc ${gcc_default_headers} -isystem ${glibcdir}/include"
	if ! echo " ${require[*]} " | grep ' linux-headers[/@: ]' >/dev/null; then
		CC="${CC} -isystem ${linuxheadersdir}/include"
		CXX="${CXX} -isystem ${linuxheadersdir}/include"
	fi
	BUILD_CC="${CC}"
	HOST_CC="${CC}"
	LDFLAGS="${LDFLAGS} -L${glibcdir}/lib -Wl,-rpath,${glibcdir}/lib -Wl,--dynamic-linker,${dynlinker}"
	if [ -z "${appfs_build_no_default_symver}" ]; then
 | 
| ︙ | ︙ | |||
| 269 270 271 272 273 274 275 | 
function postbuild() {
	:
}
function build() {
	grep "DESTDIR" Makefile >/dev/null || die "Don't know how to build this software"
 | | | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 | 
function postbuild() {
	:
}
function build() {
	grep "DESTDIR" Makefile >/dev/null || die "Don't know how to build this software"
	make "${make_extra[@]}"
}
function preinstall() {
	:
}
function postinstall() {
 | 
| ︙ | ︙ |