Hello, I'm trying to package a mesa git in hackable:1 [1], with specific drivers for the Openmoko Freerunner [2] . I tried to tweak the diff from debian unstable ; the compiling works but the packaging fails when it comes to ./lib/glx/* : there is no ./lib/glx directory (only ./lib). So I dug in the Makefiles (*the tarball made from unstable and from the git I use are not quite the same*) and I found that in both ./src/glx/X11/Makefile (which in my tarball is ./src/glx/Makefile) and ./src/mesa/drivers/Makefile, there is a "$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)" target. So I guess the second one overwrites the first one... I'm struggling to figure out how to get each one of them built in the right place. Also, your debian/rules sets a confflags-dri variable (which usage I'm not sure to understand but I bet it is added to ./configure) and confflags-dri contains "--libdir=/usr/lib/glx" ; when I add this flag, all the libraries are compiled in ./glx. Thanks in advance if you can help me David Wagner [1] http://trac.hackable1.org [2] http://git.bitwiz.org.uk/?p=mesa.git Joined: patch against the git in order to have a working "make dist"
diff --git a/Makefile b/Makefile
index ea5751d..67d27d2 100644
--- a/Makefile
+++ b/Makefile
@@ -25,13 +25,10 @@ clean:
(cd $$dir && $(MAKE) clean) ; \
fi \
done
- -@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
realclean: clean
-rm -rf lib*
- -rm -f $(TOP)/configs/current
- -rm -f $(TOP)/configs/autoconf
-rm -rf autom4te.cache
-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
-name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
@@ -186,8 +183,8 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.7
-DIRECTORY = Mesa-$(VERSION)
+VERSION=7.8.0
+DIRECTORY = .
LIB_NAME = MesaLib-$(VERSION)
DEMO_NAME = MesaDemos-$(VERSION)
GLUT_NAME = MesaGLUT-$(VERSION)
@@ -330,8 +327,10 @@ ES_FILES = \
EGL_FILES = \
$(DIRECTORY)/include/EGL/*.h \
+ $(DIRECTORY)/include/KHR/*.h \
$(DIRECTORY)/src/egl/Makefile \
$(DIRECTORY)/src/egl/*/Makefile \
+ $(DIRECTORY)/src/egl/*/Makefile.template \
$(DIRECTORY)/src/egl/*/*.[ch] \
$(DIRECTORY)/src/egl/*/*/Makefile \
$(DIRECTORY)/src/egl/*/*/*.[ch] \
@@ -530,59 +529,11 @@ rm_config:
rm -f configs/current
rm -f configs/autoconf
-lib_gz: rm_config
- cd .. ; \
- tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
- gzip $(LIB_NAME).tar ; \
- mv $(LIB_NAME).tar.gz $(DIRECTORY)
-
-demo_gz:
- cd .. ; \
- tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
- gzip $(DEMO_NAME).tar ; \
- mv $(DEMO_NAME).tar.gz $(DIRECTORY)
-
-glut_gz:
- cd .. ; \
- tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
- gzip $(GLUT_NAME).tar ; \
- mv $(GLUT_NAME).tar.gz $(DIRECTORY)
-
-lib_bz2: rm_config
- cd .. ; \
- tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
- bzip2 $(LIB_NAME).tar ; \
- mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
-
-demo_bz2:
- cd .. ; \
- tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
- bzip2 $(DEMO_NAME).tar ; \
- mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
-
-glut_bz2:
- cd .. ; \
- tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
- bzip2 $(GLUT_NAME).tar ; \
- mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
-
-lib_zip: rm_config
- rm -f $(LIB_NAME).zip ; \
- cd .. ; \
- zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
- mv $(LIB_NAME).zip $(DIRECTORY)
-
-demo_zip:
- rm -f $(DEMO_NAME).zip ; \
- cd .. ; \
- zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
- mv $(DEMO_NAME).zip $(DIRECTORY)
-
-glut_zip:
- rm -f $(GLUT_NAME).zip ; \
- cd .. ; \
- zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
- mv $(GLUT_NAME).zip $(DIRECTORY)
+dist:
+ mkdir mesa-$(VERSION) ; \
+ cp --parents $(LIB_FILES) $(DEMO_FILES) mesa-$(VERSION); \
+ tar -czf mesa-$(VERSION).tar.gz mesa-$(VERSION) ; \
+ rm -rf mesa-$(VERSION)
md5:
@-md5sum $(LIB_NAME).tar.gz
Attachment:
signature.asc
Description: OpenPGP digital signature