Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/branches/alx-0_6_0/core/xorg/xorg-7.6.1-r1.smage2

    Diff of /smage/branches/alx-0_6_0/core/xorg/xorg-7.6.1-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1826 by niro, Wed Apr 20 12:32:05 2011 UTC revision 1827 by niro, Wed Apr 20 13:23:21 2011 UTC
    # Line 791  src_compile() Line 791  src_compile()
    791   # xf86vidmodeproto is missing, dgaproto too, added missing picaccess.h and dri2 for GL extension   # xf86vidmodeproto is missing, dgaproto too, added missing picaccess.h and dri2 for GL extension
    792   # add missing libsha1 flags too   # add missing libsha1 flags too
    793   XORGSERVER_CFLAGS="$(pkg-config --cflags xf86vidmodeproto xf86dgaproto pciaccess dri2proto gl glproto libsha1)"   XORGSERVER_CFLAGS="$(pkg-config --cflags xf86vidmodeproto xf86dgaproto pciaccess dri2proto gl glproto libsha1)"
      # some needed extra flags  
      XORGSERVER_MAKE_EXTRA_FLAGS="Xorg_LDFLAGS=\'\$\(LD_EXPORT_SYMBOLS_FLAG\) \$(pkg-config --libs libsha1)\'"  
    794    
    795   # xserver   # xserver
    796   for i in ${XORG_SERVER[*]}   for i in ${XORG_SERVER[*]}
    # Line 800  src_compile() Line 798  src_compile()
    798   mysrcdir=$(eval echo \${${i}_SRCDIR})   mysrcdir=$(eval echo \${${i}_SRCDIR})
    799   cd ${mysrcdir} || die   cd ${mysrcdir} || die
    800    
      MAKE_EXTRA_FLAGS=$(eval eval echo \${${i}_MAKE_EXTRA_FLAGS})  
       
    801   CFLAGS="$(eval echo \${${i}_CFLAGS})" \   CFLAGS="$(eval echo \${${i}_CFLAGS})" \
    802   LDFLAGS="$(eval echo \${${i}_LDFLAGS})" \   LDFLAGS="$(eval echo \${${i}_LDFLAGS})" \
    803   mconfigure \   mconfigure \
    # Line 810  src_compile() Line 806  src_compile()
    806   --disable-static \   --disable-static \
    807   $(eval echo \${${i}_CONFIG_OPTS}) \   $(eval echo \${${i}_CONFIG_OPTS}) \
    808   || die   || die
    809   mmake "${MAKE_EXTRA_FLAGS}" || die  
    810     # fixes linking issues with libsha1
    811     mmake Xorg_LDFLAGS="\$(LD_EXPORT_SYMBOLS_FLAG) $(pkg-config --libs libsha1)" || die
    812   done   done
    813    
    814   # create a pkgconfig file for in-tree compile usage only   # create a pkgconfig file for in-tree compile usage only
    Legend:
    Removed from v.1826  
    changed lines
      Added in v.1827