summaryrefslogtreecommitdiffstats
path: root/meta/classes/autotools.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/autotools.bbclass')
-rw-r--r--meta/classes/autotools.bbclass38
1 files changed, 25 insertions, 13 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 83ab063376..365258f65f 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -175,6 +175,26 @@ autotools_stage_dir() {
175 fi 175 fi
176} 176}
177 177
178autotools_stage_libdir() {
179 from="$1"
180 to="$2"
181
182 olddir=`pwd`
183 cd $from
184 las=$(find . -name \*.la -type f)
185 cd $olddir
186 echo "Found la files: $las"
187 for i in $las
188 do
189 sed -e 's/^installed=yes$/installed=no/' \
190 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
191 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
192 -i $from/$i
193 done
194 autotools_stage_dir $from $to
195}
196
197
178autotools_stage_all() { 198autotools_stage_all() {
179 if [ "${INHIBIT_AUTO_STAGE}" = "1" ] 199 if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
180 then 200 then
@@ -193,19 +213,11 @@ autotools_stage_all() {
193 fi 213 fi
194 if [ -d ${STAGE_TEMP}/${libdir} ] 214 if [ -d ${STAGE_TEMP}/${libdir} ]
195 then 215 then
196 olddir=`pwd` 216 autotools_stage_libdir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
197 cd ${STAGE_TEMP}/${libdir} 217 fi
198 las=$(find . -name \*.la -type f) 218 if [ -d ${STAGE_TEMP}/${base_libdir} ]
199 cd $olddir 219 then
200 echo "Found la files: $las" 220 autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir}
201 for i in $las
202 do
203 sed -e 's/^installed=yes$/installed=no/' \
204 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
205 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
206 -i ${STAGE_TEMP}/${libdir}/$i
207 done
208 autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
209 fi 221 fi
210 rm -rf ${STAGE_TEMP}/${mandir} || true 222 rm -rf ${STAGE_TEMP}/${mandir} || true
211 rm -rf ${STAGE_TEMP}/${infodir} || true 223 rm -rf ${STAGE_TEMP}/${infodir} || true