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

Collapse All | Expand All

(-)/Gentoo/usr/portage/dev-lang/php/files/eblits/src_compile-v1.eblit (-1 / +1 lines)
Lines 38-44 Link Here
38 
			source="sapi/fpm/php-fpm"
 39 
			source="sapi/fpm/php-fpm"
39 
			;;
 40 
			;;
40 
		embed)
 41 
		embed)
41 
			source="libs/libphp${PHP_MV}.so"
 42 
			source="libs/libphp${PHP_MV}"$(get_modname)
42 
			;;
 43 
			;;
43 

          44
          

        

        

          44
          
		apache2)

          45
          
		apache2)

        



(-)/Gentoo/usr/portage/dev-lang/php/files/eblits/src_install-v1.eblit
      (-1 / +5 lines)




  

    
      
            Lines 49-55
          
      
      
        Link Here
      
    
  

        

          49
          
			into "${PHP_DESTDIR#${EPREFIX}}"

          50
          
			into "${PHP_DESTDIR#${EPREFIX}}"

        

        

          50
          
			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)

          51
          
			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)

        

        

          51
          

          52
          

        

          
            

              52
              
			if [[ "${file: -3}" == ".so" ]]; then 


              53
              
			local modname

            

            

              
              

              54
              
			modname=$(get_modname)

            

            


              55
              
			if [[ "${file: -${#modname}}" == ${modname} ]]; then 

            

        

          53
          
				if [[ "${sapi}" == "apache2" ]]; then

          56
          
				if [[ "${sapi}" == "apache2" ]]; then

        

        

          54
          
					insinto "${PHP_DESTDIR#${EPREFIX}}/../apache2/modules/"

          57
          
					insinto "${PHP_DESTDIR#${EPREFIX}}/../apache2/modules/"

        

        

          55
          
					newins "${file}" "${file/*\/}"

          58
          
					newins "${file}" "${file/*\/}"

        

  

    
      
            Lines 131-136
          
      
      
        Link Here
      
    
  

        

          131
          
			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"

          136
          
			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"

        

        

          132
          
			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2-r1" \

          137
          
			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2-r1" \

        

        

          133
          
				"70_mod_php${PHP_MV}_concurr.conf"

          138
          
				"70_mod_php${PHP_MV}_concurr.conf"

        

            

              
              
              139
              
			[[ ${CHOST} == *-darwin* ]] && sed -i 's!libphp5\.so!libphp5.bundle!' "${D}/${APACHE_MODULES_CONFDIR}/70_mod_php${PHP_MV}_concurr.conf"

            

        

          134
          

          140
          

        

        

          135
          
			# Put the ld version script in the right place so

          141
          
			# Put the ld version script in the right place so

        

        

          136
          
			# it's always accessible

          142
          
			# it's always accessible

        

  

    
      
            Lines 141-146
          
      
      
        Link Here
      
    
  

        

          141
          
			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"

          147
          
			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"

        

        

          142
          
			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2-r1" \

          148
          
			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2-r1" \

        

        

          143
          
				"70_mod_php${PHP_MV}.conf"

          149
          
				"70_mod_php${PHP_MV}.conf"

        

            

              
              
              150
              
			[[ ${CHOST} == *-darwin* ]] && sed -i 's!libphp5\.so!libphp5.bundle!' "${D}/${APACHE_MODULES_CONFDIR}/70_mod_php${PHP_MV}.conf"

            

        

          144
          
		fi

          151
          
		fi

        

        

          145
          
	fi

          152
          
	fi

        

        

          146
          

          153
          

        



(-)/Gentoo/usr/portage/dev-lang/php/php-5.3.3-r1.ebuild
      (+2 lines)




  

    
      
            Lines 333-338
          
      
      
        Link Here
      
    
  

        

          333
          
		epatch "${FILESDIR}/php-5.3.3-ulong-osx.patch"

          333
          
		epatch "${FILESDIR}/php-5.3.3-ulong-osx.patch"

        

        

          334
          
	fi

          334
          
	fi

        

        

          335
          

          335
          

        

            

              
              
              336
              
	epatch "${FILESDIR}"/${P}-darwin-bundle.patch

            

            

              337
              
	epatch "${FILESDIR}"/${P}-darwin-install-it.patch

            

        

          336
          
	eblit-run src_prepare v1 ; 

          338
          
	eblit-run src_prepare v1 ; 

        

        

          337
          
}

          339
          
}

        

        

          338
          
src_configure() { eblit-run src_configure v1 ; }

          340
          
src_configure() { eblit-run src_configure v1 ; }

        






  

  Return to bug 338040