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: | fc15516eae368c2991d71e18b5bf01aba6b8de76 |
User & Date: | rkeene on 2014-11-20 20:59:56 |
Other Links: | 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 174 if [ -d "${pkgconfigdir}" ]; then 175 175 PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${pkgconfigdir}" 176 176 export PKG_CONFIG_PATH 177 177 fi 178 178 ;; 179 179 esac 180 180 done 181 + 182 + break 181 183 done 182 184 183 185 if [ "${pkgfound}" = '0' ]; then 184 186 die "Package ${pkg}/${pkgversion:-*}@${pkgdomain} not found." 185 187 fi 186 188 done 187 189 } ................................................................................ 235 237 if [ ! -f "${dynlinker}" ]; then 236 238 die 'glibc directory is not available (appfs running/working?)' 237 239 fi 238 240 239 241 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' ' ')" 240 242 241 243 CC="${CC:-gcc} -nostdinc ${gcc_default_headers} -isystem ${glibcdir}/include" 244 + CXX="${CXX:-g++} -nostdinc ${gcc_default_headers} -isystem ${glibcdir}/include" 242 245 243 246 if ! echo " ${require[*]} " | grep ' linux-headers[/@: ]' >/dev/null; then 244 247 CC="${CC} -isystem ${linuxheadersdir}/include" 248 + CXX="${CXX} -isystem ${linuxheadersdir}/include" 245 249 fi 246 250 247 251 BUILD_CC="${CC}" 248 252 HOST_CC="${CC}" 249 253 250 254 LDFLAGS="${LDFLAGS} -L${glibcdir}/lib -Wl,-rpath,${glibcdir}/lib -Wl,--dynamic-linker,${dynlinker}" 251 255 if [ -z "${appfs_build_no_default_symver}" ]; then ................................................................................ 269 273 function postbuild() { 270 274 : 271 275 } 272 276 273 277 function build() { 274 278 grep "DESTDIR" Makefile >/dev/null || die "Don't know how to build this software" 275 279 276 - make 280 + make "${make_extra[@]}" 277 281 } 278 282 279 283 function preinstall() { 280 284 : 281 285 } 282 286 283 287 function postinstall() {